r14727 - gnucash/trunk - msys sed doesn't understand "-i". Work around that.

Derek Atkins warlord at cvs.gnucash.org
Sat Aug 26 02:03:03 EDT 2006


Author: warlord
Date: 2006-08-26 02:03:02 -0400 (Sat, 26 Aug 2006)
New Revision: 14727
Trac: http://svn.gnucash.org/trac/changeset/14727

Modified:
   gnucash/trunk/
   gnucash/trunk/packaging/win32/install.sh
Log:
msys sed doesn't understand "-i".  Work around that.



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13130
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13132

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-08-26 05:31:02 UTC (rev 14726)
+++ gnucash/trunk/packaging/win32/install.sh	2006-08-26 06:03:02 UTC (rev 14727)
@@ -546,7 +546,12 @@
 		patch -p1 < $GOFFICE_PATCH
 	    autoconf
 	    ./configure --prefix=$_GOFFICE_UDIR
-	    find . -name Makefile.am | xargs sed -i -e '/INTLTOOL_XML_RULE/d'
+	    for f in `find . -name Makefile.am` ; do
+		if [ `grep -c INTLTOOL_XML_RULE $f` != 0 ] ; then
+		    cp $f $f.bak
+		    cat $f.bak | sed -e '/INTLTOOL_XML_RULE/d' > $f
+		fi
+	    done
 	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
 	    make
 	    make install



More information about the gnucash-changes mailing list