docs-common Makefile.common,1.34,1.35

Tommy Reynolds (jtr) fedora-docs-commits at redhat.com
Mon Jan 30 10:31:57 UTC 2006


Author: jtr

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8374

Modified Files:
	Makefile.common 
Log Message:
When using find(1) to generate the list of candidate files for the
tarball, do not expand the filenames onto the command line, using
"find *" because a filename with an embedded '#" will bork the
remainder of the command line, seriously breaking the build process.
Thanks again, Emacs!



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.common	20 Jan 2006 01:05:14 -0000	1.34
+++ Makefile.common	30 Jan 2006 10:31:48 -0000	1.35
@@ -332,18 +332,18 @@
 	${MAKE} kde.desktop
 	${MAKE} khelp.desktop
 	${MAKE} omf
-	mkdir $(DOCBASE)-$(VERSION)
-	find * '('							\
-	-name '.*'							\
-	-o -name 'CVS'							\
-	-o -name 'rpm'							\
-	-o -name '*.rpm'						\
-	-o -name '#*'							\
-	-o -name '*~'							\
-	-o -name '*.tar.gz'						\
-	-o -name '*.tmp'						\
-	-o -name '${DOCBASE}-${VERSION}'				\
-	')' -prune -o -print | cpio -pamdv $(DOCBASE)-$(VERSION)
+	${RM} -r $(DOCBASE)-$(VERSION)
+	mkdir -p $(DOCBASE)-$(VERSION)
+	find . '('							\
+		-name '*#*'						\
+		-o -name 'CVS'						\
+		-o -name 'rpm'						\
+		-o -name '*.rpm'					\
+		-o -name '*~'						\
+		-o -name '*.tar.gz'					\
+		-o -name '*.tmp'					\
+		-o -name '${DOCBASE}-${VERSION}'			\
+	')' -prune -o -print | tee /tmp/log.files | cpio -pamdv $(DOCBASE)-$(VERSION)
 	tar -zcvf $@ $(DOCBASE)-$(VERSION)/
 	${RM} -r $(DOCBASE)-$(VERSION)
 




More information about the Fedora-docs-commits mailing list