docs-common Makefile.common,1.16,1.17

Tommy Reynolds (jtr) fedora-docs-commits at redhat.com
Fri Dec 2 16:04:05 UTC 2005


Author: jtr

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

Modified Files:
	Makefile.common 
Log Message:
HTMLCSS and HTMLCSSEXTRA weren't copied to the correct locations in the
html-nochunk target. [Bug #174805]



Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.common	1 Dec 2005 21:10:46 -0000	1.16
+++ Makefile.common	2 Dec 2005 16:03:46 -0000	1.17
@@ -84,8 +84,8 @@
 	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml
 	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)/
+	cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
+	cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/
 	[ ! -d figs ] || (						\
 		mkdir -p ${DOCBASE}-$(1)/figs;				\
 		find figs -type f -iname '*.*' -print		|	\
@@ -106,8 +106,8 @@
 	${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml
 	mkdir -p stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
-	cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css
-	cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/
+	cp ${HTMLCSS} fedora.css
+	cp ${HTMLCSSEXTRA} .
 endef
 #
 html-nochunks::	$(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)




More information about the Fedora-docs-commits mailing list