Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24116/docs-common
Modified Files:
Makefile.common
Log Message:
Added ${HTMLCSS} and ${HTMLCSSEXTRA} macros to "docs-common/Makefile.common"
to allow dynamic specification of which CSS stylesheet to attach to the
gnerated HTML rendering.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.common 29 Nov 2005 21:42:28 -0000 1.15
+++ Makefile.common 1 Dec 2005 21:10:46 -0000 1.16
@@ -32,7 +32,7 @@
# Supply default values for the boilerplate files _unless_ the user has
# provided their own values.
ifeq (${FDPDIR},)
-FDPDIR = ..
+FDPDIR = ..
endif
ifeq (${XSLPDF},)
XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl
@@ -43,6 +43,12 @@
ifeq (${XSLHTMLNOCHUNKS},)
XSLHTMLNOCHUNKS = ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl
endif
+ifeq (${HTMLCSS},)
+HTMLCSS = ${FDPDIR}/docs-common/css/fedora-draft.css
+endif
+ifeq (${HTMLCSSEXTRA},)
+HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark.png
+endif
#########################################################################
# Define a macro to locate xmlto(1) so we can choose a specific version
# by "make XMLTO=/path/to/xmlto", if we so desire.
@@ -64,7 +70,8 @@
# LANG=en.UTF-8 ${XMLTO} html -x $(XSLHTML) -o mydoc-en mydoc-en.xml
# mkdir -p mydoc-en/stylesheet-images
# cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/
-# cp ${FDPDIR}/docs-common/css/fedora*.css mydoc-en/
+# cp ${HTMLCSS} mydoc-en/fedora.css
+# cp ${HTMLCSSEXTRA} mydoc-en/
# cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/
# mkdir -p mydoc-en/figs
# cp -p figs/*-${LANG}.* mydoc-en/figs
@@ -77,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 ${FDPDIR}/docs-common/css/fedora*.css $$(DOCBASE)-$(1)/
- cp ${FDPDIR}/docs-common/images/watermark.png $${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 | \
@@ -99,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 ${FDPDIR}/docs-common/css/fedora*.css .
- cp ${FDPDIR}/docs-common/images/watermark.png .
+ cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css
+ cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/
endef
#
html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)
@@ -139,7 +146,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.png
endef
#
distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
Show replies by date