diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/path_prog_fixes.patch')
| -rw-r--r-- | meta/recipes-devtools/automake/automake/path_prog_fixes.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch new file mode 100644 index 0000000000..fb38442e30 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | --- | ||
| 2 | Makefile.am | 3 ++- | ||
| 3 | Makefile.in | 3 ++- | ||
| 4 | aclocal.in | 4 ++-- | ||
| 5 | automake.in | 6 ++++-- | ||
| 6 | 4 files changed, 10 insertions(+), 6 deletions(-) | ||
| 7 | |||
| 8 | Index: automake-1.10.1/Makefile.am | ||
| 9 | =================================================================== | ||
| 10 | --- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000 | ||
| 11 | +++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100 | ||
| 12 | @@ -75,7 +75,8 @@ | ||
| 13 | -e 's,[@]SHELL[@],$(SHELL),g' \ | ||
| 14 | -e 's,[@]VERSION[@],$(VERSION),g' \ | ||
| 15 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ | ||
| 16 | - -e 's,[@]datadir[@],$(datadir),g' | ||
| 17 | + -e 's,[@]datadir[@],$(datadir),g' \ | ||
| 18 | + -e 's,[@]bindir[@],$(bindir),g' | ||
| 19 | |||
| 20 | ## These files depend on Makefile so they are rebuilt if $(VERSION), | ||
| 21 | ## $(datadir) or other do_subst'ituted variables change. | ||
| 22 | Index: automake-1.10.1/Makefile.in | ||
| 23 | =================================================================== | ||
| 24 | --- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000 | ||
| 25 | +++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100 | ||
| 26 | @@ -185,7 +185,8 @@ | ||
| 27 | -e 's,[@]SHELL[@],$(SHELL),g' \ | ||
| 28 | -e 's,[@]VERSION[@],$(VERSION),g' \ | ||
| 29 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ | ||
| 30 | - -e 's,[@]datadir[@],$(datadir),g' | ||
| 31 | + -e 's,[@]datadir[@],$(datadir),g' \ | ||
| 32 | + -e 's,[@]bindir[@],$(bindir),g' | ||
| 33 | |||
| 34 | WGET = wget | ||
| 35 | WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/ | ||
| 36 | Index: automake-1.10.1/aclocal.in | ||
| 37 | =================================================================== | ||
| 38 | --- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000 | ||
| 39 | +++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100 | ||
| 40 | @@ -1,8 +1,8 @@ | ||
| 41 | -#!@PERL@ -w | ||
| 42 | +#!@bindir@/env perl | ||
| 43 | # -*- perl -*- | ||
| 44 | # @configure_input@ | ||
| 45 | |||
| 46 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 47 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
| 48 | if 0; | ||
| 49 | |||
| 50 | # aclocal - create aclocal.m4 by scanning configure.ac | ||
| 51 | Index: automake-1.10.1/automake.in | ||
| 52 | =================================================================== | ||
| 53 | --- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000 | ||
| 54 | +++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100 | ||
| 55 | @@ -1,8 +1,10 @@ | ||
| 56 | -#!@PERL@ -w | ||
| 57 | +#!@bindir@/env perl | ||
| 58 | # -*- perl -*- | ||
| 59 | # @configure_input@ | ||
| 60 | |||
| 61 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 62 | +use warnings; | ||
| 63 | + | ||
| 64 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
| 65 | if 0; | ||
| 66 | |||
| 67 | # automake - create Makefile.in from Makefile.am | ||