diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-10-10 16:24:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-10-10 16:24:26 +0000 |
| commit | f0676a33667bde48bcb050eaa177923eb70a3cce (patch) | |
| tree | b54e67fdce4dff889d488c4e046cc558c04add05 /meta | |
| parent | b2396b62820db9dc4093aebff19d465d76125be8 (diff) | |
| download | poky-f0676a33667bde48bcb050eaa177923eb70a3cce.tar.gz | |
automake: Fix patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5480 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/automake/files/path_prog_fixes.patch | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/meta/packages/automake/files/path_prog_fixes.patch b/meta/packages/automake/files/path_prog_fixes.patch index 32e190e240..fb38442e30 100644 --- a/meta/packages/automake/files/path_prog_fixes.patch +++ b/meta/packages/automake/files/path_prog_fixes.patch | |||
| @@ -5,11 +5,11 @@ | |||
| 5 | automake.in | 6 ++++-- | 5 | automake.in | 6 ++++-- |
| 6 | 4 files changed, 10 insertions(+), 6 deletions(-) | 6 | 4 files changed, 10 insertions(+), 6 deletions(-) |
| 7 | 7 | ||
| 8 | --- automake-1.10.orig/Makefile.am | 8 | Index: automake-1.10.1/Makefile.am |
| 9 | +++ automake-1.10/Makefile.am | 9 | =================================================================== |
| 10 | @@ -73,11 +73,12 @@ do_subst = sed \ | 10 | --- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000 |
| 11 | -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \ | 11 | +++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100 |
| 12 | -e 's,[@]PERL[@],$(PERL),g' \ | 12 | @@ -75,7 +75,8 @@ |
| 13 | -e 's,[@]SHELL[@],$(SHELL),g' \ | 13 | -e 's,[@]SHELL[@],$(SHELL),g' \ |
| 14 | -e 's,[@]VERSION[@],$(VERSION),g' \ | 14 | -e 's,[@]VERSION[@],$(VERSION),g' \ |
| 15 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ | 15 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ |
| @@ -19,13 +19,11 @@ | |||
| 19 | 19 | ||
| 20 | ## These files depend on Makefile so they are rebuilt if $(VERSION), | 20 | ## These files depend on Makefile so they are rebuilt if $(VERSION), |
| 21 | ## $(datadir) or other do_subst'ituted variables change. | 21 | ## $(datadir) or other do_subst'ituted variables change. |
| 22 | ## Use chmod a-w to prevent people from editing the wrong file by accident. | 22 | Index: automake-1.10.1/Makefile.in |
| 23 | automake: automake.in | 23 | =================================================================== |
| 24 | --- automake-1.10.orig/Makefile.in | 24 | --- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000 |
| 25 | +++ automake-1.10/Makefile.in | 25 | +++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100 |
| 26 | @@ -183,11 +183,12 @@ do_subst = sed \ | 26 | @@ -185,7 +185,8 @@ |
| 27 | -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \ | ||
| 28 | -e 's,[@]PERL[@],$(PERL),g' \ | ||
| 29 | -e 's,[@]SHELL[@],$(SHELL),g' \ | 27 | -e 's,[@]SHELL[@],$(SHELL),g' \ |
| 30 | -e 's,[@]VERSION[@],$(VERSION),g' \ | 28 | -e 's,[@]VERSION[@],$(VERSION),g' \ |
| 31 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ | 29 | -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ |
| @@ -34,12 +32,12 @@ | |||
| 34 | + -e 's,[@]bindir[@],$(bindir),g' | 32 | + -e 's,[@]bindir[@],$(bindir),g' |
| 35 | 33 | ||
| 36 | WGET = wget | 34 | WGET = wget |
| 37 | WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ | 35 | WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/ |
| 38 | FETCHFILES = \ | 36 | Index: automake-1.10.1/aclocal.in |
| 39 | INSTALL \ | 37 | =================================================================== |
| 40 | --- automake-1.10.orig/aclocal.in | 38 | --- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000 |
| 41 | +++ automake-1.10/aclocal.in | 39 | +++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100 |
| 42 | @@ -1,10 +1,10 @@ | 40 | @@ -1,8 +1,8 @@ |
| 43 | -#!@PERL@ -w | 41 | -#!@PERL@ -w |
| 44 | +#!@bindir@/env perl | 42 | +#!@bindir@/env perl |
| 45 | # -*- perl -*- | 43 | # -*- perl -*- |
| @@ -50,11 +48,11 @@ | |||
| 50 | if 0; | 48 | if 0; |
| 51 | 49 | ||
| 52 | # aclocal - create aclocal.m4 by scanning configure.ac | 50 | # aclocal - create aclocal.m4 by scanning configure.ac |
| 53 | 51 | Index: automake-1.10.1/automake.in | |
| 54 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 52 | =================================================================== |
| 55 | --- automake-1.10.orig/automake.in | 53 | --- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000 |
| 56 | +++ automake-1.10/automake.in | 54 | +++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100 |
| 57 | @@ -1,10 +1,12 @@ | 55 | @@ -1,8 +1,10 @@ |
| 58 | -#!@PERL@ -w | 56 | -#!@PERL@ -w |
| 59 | +#!@bindir@/env perl | 57 | +#!@bindir@/env perl |
| 60 | # -*- perl -*- | 58 | # -*- perl -*- |
| @@ -67,5 +65,3 @@ | |||
| 67 | if 0; | 65 | if 0; |
| 68 | 66 | ||
| 69 | # automake - create Makefile.in from Makefile.am | 67 | # automake - create Makefile.in from Makefile.am |
| 70 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
| 71 | # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||