diff options
| author | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
|---|---|---|
| committer | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
| commit | a93dfebb9e7a34ffba9b1ae5e8e496dfab4c3c43 (patch) | |
| tree | 6c38a4617c92398269e6603a0509fc3006811368 /recipes/automake/files/path_prog_fixes.patch | |
| parent | 4255898da29e7e0c521d064afedbc4075b3e8155 (diff) | |
| parent | d7fdcef3d8c8b80926d579c2db179b594429cebe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/automake/files/path_prog_fixes.patch')
| -rw-r--r-- | recipes/automake/files/path_prog_fixes.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes/automake/files/path_prog_fixes.patch b/recipes/automake/files/path_prog_fixes.patch new file mode 100644 index 0000000000..69cea77035 --- /dev/null +++ b/recipes/automake/files/path_prog_fixes.patch @@ -0,0 +1,55 @@ +Index: automake-1.10.2/Makefile.am +=================================================================== +--- automake-1.10.2.orig/Makefile.am ++++ automake-1.10.2/Makefile.am +@@ -75,7 +75,8 @@ + -e 's,[@]SHELL[@],$(SHELL),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ +- -e 's,[@]datadir[@],$(datadir),g' ++ -e 's,[@]datadir[@],$(datadir),g' \ ++ -e 's,[@]bindir[@],$(bindir),g' + + ## These files depend on Makefile so they are rebuilt if $(VERSION), + ## $(datadir) or other do_subst'ituted variables change. +Index: automake-1.10.2/Makefile.in +=================================================================== +--- automake-1.10.2.orig/Makefile.in ++++ automake-1.10.2/Makefile.in +@@ -186,7 +186,8 @@ + -e 's,[@]SHELL[@],$(SHELL),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ +- -e 's,[@]datadir[@],$(datadir),g' ++ -e 's,[@]datadir[@],$(datadir),g' \ ++ -e 's,[@]bindir[@],$(bindir),g' + + WGET = wget + WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/ +Index: automake-1.10.2/automake.in +=================================================================== +--- automake-1.10.2.orig/automake.in ++++ automake-1.10.2/automake.in +@@ -1,8 +1,10 @@ +-#!@PERL@ -w ++#!@bindir@/env perl + # -*- perl -*- + # @configure_input@ + +-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' ++use warnings; ++ ++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' + if 0; + + # automake - create Makefile.in from Makefile.am +Index: automake-1.10.2/aclocal.in +=================================================================== +--- automake-1.10.2.orig/aclocal.in ++++ automake-1.10.2/aclocal.in +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@bindir@/env perl -w + # -*- perl -*- + # @configure_input@ + |