Update of /cvsroot/monetdb/MonetDB
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7335

Modified Files:
        rpm.mk.in 
Log Message:
Remove #line directives from all packaged files to avoid confusion.
Made a command more portable by not using \{i%.in}.

Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/rpm.mk.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- rpm.mk.in   14 Sep 2007 10:02:51 -0000      1.24
+++ rpm.mk.in   6 Dec 2007 10:02:39 -0000       1.25
@@ -21,7 +21,7 @@
 rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpm
 
 $(top_builddir)/$(distdir).tar.gz:
-       $(MAKE) $(AM_MAKEFLAGS) dist
+       $(MAKE) $(AM_MAKEFLAGS) MXFLAGS=-l dist
 
 $(rpmtopdir)/rpmmacros:
        mkdir -p $(rpmtopdir)/RPMS
@@ -55,6 +55,7 @@
 
 cleanup_distr:
        find MonetDB-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh ! -exec 
grep -q '^#!' {} \; -exec chmod a-x {} \;
-       find MonetDB-* -name \*.in ! -name configure.in ! -name \*.spec.in 
-print | while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
+       find MonetDB-* -type f ! -name \*.in ! -name configure ! -name \*.spec 
-print | while read i; do test -f "$${i}.in" && rm -f "$${i}"; done || true
+       find MonetDB-* -type f -exec sed -n -e "/^#line/!w 
$${TMPDIR:-/var/tmp}/mn-dist-$$$$" {} \; -exec mv -f 
$${TMPDIR:-/var/tmp}/mn-dist-$$$$ {} \;
 
 dist-hook: cleanup_distr


-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to