diff options
| author |   Chris Larson <clarson@kergoth.com> | 2005-03-09 21:51:27 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2005-03-09 21:51:27 +0000 |
| commit | 2f0c96f2f7aa39f59345261fd2470eba55b7b989 (patch) | |
| tree | 733bdeb7f4a96f4d788683e80db798859bd66639 /packages/automake/files | |
| parent | 4828523eba3a9aaf08cdb8ae05b5bf7a018b922c (diff) | |
| download | openembedded-2f0c96f2f7aa39f59345261fd2470eba55b7b989.tar.gz | |
Fix the automake path bits .. again .. forgot to patch Makefile.in while i was patching Makefile.am, so the automake build tried to call the local automake on its own buildsystem before it built it..
BKrev: 422f6fdf4Y80DL4lbmlJib9su7S22A
Diffstat (limited to 'packages/automake/files')
| -rw-r--r-- | packages/automake/files/path_prog_fixes.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/packages/automake/files/path_prog_fixes.patch b/packages/automake/files/path_prog_fixes.patch index 21ba1dde71..a85b244205 100644 --- a/packages/automake/files/path_prog_fixes.patch +++ b/packages/automake/files/path_prog_fixes.patch @@ -1,7 +1,7 @@ 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:37:26.378381328 -0500 ++++ 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' \ @@ -12,10 +12,24 @@ Index: automake-1.9.3/Makefile.am ## 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~ Index: automake-1.9.3/aclocal.in =================================================================== --- automake-1.9.3.orig/aclocal.in 2004-10-10 12:10:24.000000000 -0400 -+++ automake-1.9.3/aclocal.in 2005-03-09 16:35:22.082277208 -0500 ++++ automake-1.9.3/aclocal.in 2005-03-09 16:47:38.241364016 -0500 @@ -1,8 +1,8 @@ -#!@PERL@ +#!@bindir@/env perl @@ -30,7 +44,7 @@ Index: automake-1.9.3/aclocal.in Index: automake-1.9.3/automake.in =================================================================== --- automake-1.9.3.orig/automake.in 2004-10-21 16:23:26.000000000 -0400 -+++ automake-1.9.3/automake.in 2005-03-09 16:35:22.086276600 -0500 ++++ automake-1.9.3/automake.in 2005-03-09 16:47:38.245363408 -0500 @@ -1,8 +1,10 @@ -#!@PERL@ -w +#!@bindir@/env perl |