[csw-devel] SF.net SVN: gar:[13185] csw/mgar/pkg/gettext/trunk/files/ 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch

[bdwalton at users.sourceforge.net]

Revision: 13185
          http://gar.svn.sourceforge.net/gar/?rev=13185&view=rev
Author:   bdwalton
Date:     2011-02-04 03:23:30 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
gettext/trunk: update patch to work with new configure tweak patch

Modified Paths:
--------------
    csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch

Modified: csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch	2011-02-03 21:55:08 UTC (rev 13184)
+++ csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch	2011-02-04 03:23:30 UTC (rev 13185)
@@ -1,4 +1,4 @@
-From 5ab8effba3fe58f3adf06190be6e27ada75f2658 Mon Sep 17 00:00:00 2001
+From 2ecccf6cc0d6b295ce6839b3ba9a92e430b1cf7a Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
 Date: Thu, 26 Aug 2010 03:44:59 +0200
 Subject: [PATCH] Use the auto-detected SHELL to run convert-archive
@@ -7,11 +7,38 @@
 construct that it's broken /bin/sh couldn't handle.  We now force the
 use of the auto-detected POSIX-compliant SHELL to run that script.
 
+We alter both Makefile.in and Makefile.am, which makes this change
+sticky across automake invocations.  We bumped this after applying Peter
+Felecan's configure changes.
+
 Signed-off-by: Ben Walton <bwalton at opencsw.org>
 ---
+ gettext-tools/misc/Makefile.am |    4 ++--
  gettext-tools/misc/Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
+diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
+index 4147e18..14cdc93 100644
+--- a/gettext-tools/misc/Makefile.am
++++ b/gettext-tools/misc/Makefile.am
+@@ -52,7 +52,7 @@ archive.git.tar.gz: archive.dir.tar.gz
+ 	else \
+ 	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
+ 	fi; \
+-	./convert-archive dir git "$$inputfile" $@
++	$(SHELL) ./convert-archive dir git "$$inputfile" $@
+ 
+ # The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
+ archive.cvs.tar.gz: archive.dir.tar.gz
+@@ -61,7 +61,7 @@ archive.cvs.tar.gz: archive.dir.tar.gz
+ 	else \
+ 	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
+ 	fi; \
+-	./convert-archive dir cvs "$$inputfile" $@
++	$(SHELL) ./convert-archive dir cvs "$$inputfile" $@
+ 
+ # Emacs Lisp code.
+ 
 diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
 index 8d2b112..bc42b35 100644
 --- a/gettext-tools/misc/Makefile.in
@@ -35,5 +62,5 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 -- 
-1.7.1
+1.7.3.2
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.