automake: rediff path_prog_fixes for 1.10
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Feb 2009 14:49:16 +0000 (15:49 +0100)
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>
Fri, 27 Feb 2009 13:11:32 +0000 (14:11 +0100)
* people should really test things before making it a global default. 'sane default' implies that at least do_patch succeeds

packages/automake/automake-1.10/path_prog_fixes.patch [new file with mode: 0644]

diff --git a/packages/automake/automake-1.10/path_prog_fixes.patch b/packages/automake/automake-1.10/path_prog_fixes.patch
new file mode 100644 (file)
index 0000000..60d3283
--- /dev/null
@@ -0,0 +1,43 @@
+Index: automake-1.9.3/Makefile.am
+===================================================================
+--- automake-1.9.3.orig/Makefile.am    2004-10-25 14:57:30.000000000 -0400
++++ automake-1.9.3/Makefile.am 2005-03-09 16:47:38.241364016 -0500
+@@ -66,7 +66,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.9.3/Makefile.in
+===================================================================
+--- automake-1.9.3.orig/Makefile.in    2004-11-01 05:23:54.000000000 -0500
++++ automake-1.9.3/Makefile.in 2005-03-09 16:47:54.712859968 -0500
+@@ -161,7 +161,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
+ WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
+--- /tmp/aclocal.in    2009-02-25 15:43:38.000000000 +0100
++++ automake-1.10/aclocal.in   2009-02-25 15:44:54.000000000 +0100
+@@ -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;
+ # aclocal - create aclocal.m4 by scanning configure.ac