From f0676a33667bde48bcb050eaa177923eb70a3cce Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 10 Oct 2008 16:24:26 +0000
Subject: automake: Fix patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5480 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/automake/files/path_prog_fixes.patch | 46 ++++++++++------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'meta/packages/automake')

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