docs-common Makefile.common,1.18,1.19

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
Allow ${HTMLCSSEXTRA} to be blank and not create the "watermark.png" file.
Copy "watermark-${LANG}.png" to "watermark.png" by default.



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.common	10 Dec 2005 02:23:43 -0000	1.18
+++ Makefile.common	10 Dec 2005 02:53:07 -0000	1.19
@@ -71,7 +71,7 @@
 #  mkdir -p mydoc-en/stylesheet-images
 #  cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/
 #  cp ${HTMLCSS} mydoc-en/fedora.css
-#  cp ${HTMLCSSEXTRA} mydoc-en/
+#  cp ${HTMLCSSEXTRA} mydoc-en/watermark.png
 #  cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/
 #  mkdir -p mydoc-en/figs
 #  cp -p figs/*-${LANG}.* mydoc-en/figs
@@ -85,7 +85,8 @@
 	mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
 	cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
-	cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/
+	[ -z "${HTMLCSSEXTRA}" ] || 					\
+		cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png
 	[ ! -d figs ] || (						\
 		mkdir -p ${DOCBASE}-$(1)/figs;				\
 		find figs -type f -iname '*.*' -print		|	\
@@ -107,7 +108,8 @@
 	mkdir -p stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
 	cp ${HTMLCSS} fedora.css
-	cp ${HTMLCSSEXTRA} .
+	[ -z "${HTMLCSSEXTRA}" ] || 					\
+		cp ${HTMLCSSEXTRA} watermark.png
 endef
 #
 html-nochunks::	$(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)
@@ -146,7 +148,7 @@
 	${RM} -r ${DOCBASE}-$(1).html stylesheet-images
 	${RM} -r ${DOCBASE}-$(1).pdf
 	${RM} -r ${DOCBASE}-$(1).tar.gz
-	${RM} fedora.css watermark.png
+	${RM} fedora.css watermark-${LANG}.png
 endef
 #
 distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)