patch-lackey_tests_Makefile_in 3.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. --- valgrind-3.7.0.orig/lackey/tests/Makefile.in 2011-11-05 12:26:52.000000000 +0100
  2. +++ valgrind-3.7.0/lackey/tests/Makefile.in 2013-07-23 12:27:53.000000000 +0200
  3. @@ -1,4 +1,4 @@
  4. -# Makefile.in generated by automake 1.11.1 from Makefile.am.
  5. +# Makefile.in generated by automake 1.10.3 from Makefile.am.
  6. # @configure_input@
  7. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  8. @@ -17,9 +17,8 @@
  9. VPATH = @srcdir@
  10. pkgdatadir = $(datadir)/@PACKAGE@
  11. -pkgincludedir = $(includedir)/@PACKAGE@
  12. pkglibdir = $(libdir)/@PACKAGE@
  13. -pkglibexecdir = $(libexecdir)/@PACKAGE@
  14. +pkgincludedir = $(includedir)/@PACKAGE@
  15. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  16. install_sh_DATA = $(install_sh) -c -m 644
  17. install_sh_PROGRAM = $(install_sh) -c
  18. @@ -44,7 +43,6 @@ am__configure_deps = $(am__aclocal_m4_de
  19. mkinstalldirs = $(install_sh) -d
  20. CONFIG_HEADER = $(top_builddir)/config.h
  21. CONFIG_CLEAN_FILES =
  22. -CONFIG_CLEAN_VPATH_FILES =
  23. SCRIPTS = $(dist_noinst_SCRIPTS)
  24. SOURCES =
  25. DIST_SOURCES =
  26. @@ -131,6 +129,7 @@ VERSION = @VERSION@
  27. VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@
  28. VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@
  29. VGCONF_OS = @VGCONF_OS@
  30. +VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@
  31. VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@
  32. VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@
  33. VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@
  34. @@ -199,9 +198,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  35. exit 1;; \
  36. esac; \
  37. done; \
  38. - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lackey/tests/Makefile'; \
  39. - $(am__cd) $(top_srcdir) && \
  40. - $(AUTOMAKE) --foreign lackey/tests/Makefile
  41. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lackey/tests/Makefile'; \
  42. + cd $(top_srcdir) && \
  43. + $(AUTOMAKE) --foreign lackey/tests/Makefile
  44. .PRECIOUS: Makefile
  45. Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  46. @case '$?' in \
  47. @@ -219,7 +218,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  48. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  49. $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  50. cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  51. -$(am__aclocal_m4_deps):
  52. tags: TAGS
  53. TAGS:
  54. @@ -243,17 +241,13 @@ distdir: $(DISTFILES)
  55. if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  56. if test -d $$d/$$file; then \
  57. dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  58. - if test -d "$(distdir)/$$file"; then \
  59. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  60. - fi; \
  61. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  62. - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  63. - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  64. + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  65. fi; \
  66. - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  67. + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  68. else \
  69. - test -f "$(distdir)/$$file" \
  70. - || cp -p $$d/$$file "$(distdir)/$$file" \
  71. + test -f $(distdir)/$$file \
  72. + || cp -p $$d/$$file $(distdir)/$$file \
  73. || exit 1; \
  74. fi; \
  75. done
  76. @@ -281,7 +275,6 @@ clean-generic:
  77. distclean-generic:
  78. -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  79. - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  80. maintainer-clean-generic:
  81. @echo "This command is intended for maintainers to use"
  82. @@ -364,7 +357,6 @@ uninstall-am:
  83. maintainer-clean maintainer-clean-generic mostlyclean \
  84. mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
  85. -
  86. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  87. # Otherwise a system limit (for SysV at least) may be exceeded.
  88. .NOEXPORT: