sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

automake: Fix patch 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5480 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2008-10-10 16:24:26 +00:00
parent b2396b6282
commit f0676a3366
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta/packages/automake/files/path_prog_fixes.patch
View File

@ -5,11 +5,11 @@
automake.in | 6 ++++-- automake.in | 6 ++++--
4 files changed, 10 insertions(+), 6 deletions(-) 4 files changed, 10 insertions(+), 6 deletions(-)
--- automake-1.10.orig/Makefile.am Index: automake-1.10.1/Makefile.am
+++ automake-1.10/Makefile.am ===================================================================
@@ -73,11 +73,12 @@ do_subst = sed \ --- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \ +++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100
-e 's,[@]PERL[@],$(PERL),g' \ @@ -75,7 +75,8 @@
-e 's,[@]SHELL[@],$(SHELL),g' \ -e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
@ -19,13 +19,11 @@
## These files depend on Makefile so they are rebuilt if $(VERSION), ## These files depend on Makefile so they are rebuilt if $(VERSION),
## $(datadir) or other do_subst'ituted variables change. ## $(datadir) or other do_subst'ituted variables change.
## Use chmod a-w to prevent people from editing the wrong file by accident. Index: automake-1.10.1/Makefile.in
automake: automake.in ===================================================================
--- automake-1.10.orig/Makefile.in --- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000
+++ automake-1.10/Makefile.in +++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100
@@ -183,11 +183,12 @@ do_subst = sed \ @@ -185,7 +185,8 @@
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]SHELL[@],$(SHELL),g' \ -e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
@ -34,12 +32,12 @@
+ -e 's,[@]bindir[@],$(bindir),g' + -e 's,[@]bindir[@],$(bindir),g'
WGET = wget WGET = wget
WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
FETCHFILES = \ Index: automake-1.10.1/aclocal.in
INSTALL \ ===================================================================
--- automake-1.10.orig/aclocal.in --- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000
+++ automake-1.10/aclocal.in +++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100
@@ -1,10 +1,10 @@ @@ -1,8 +1,8 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@bindir@/env perl +#!@bindir@/env perl
# -*- perl -*- # -*- perl -*-
@ -50,11 +48,11 @@
if 0; if 0;
# aclocal - create aclocal.m4 by scanning configure.ac # aclocal - create aclocal.m4 by scanning configure.ac
Index: automake-1.10.1/automake.in
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ===================================================================
--- automake-1.10.orig/automake.in --- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000
+++ automake-1.10/automake.in +++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100
@@ -1,10 +1,12 @@ @@ -1,8 +1,10 @@
-#!@PERL@ -w -#!@PERL@ -w
+#!@bindir@/env perl +#!@bindir@/env perl
# -*- perl -*- # -*- perl -*-
@ -67,5 +65,3 @@
if 0; if 0;
# automake - create Makefile.in from Makefile.am # automake - create Makefile.in from Makefile.am
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.