docs-common Makefile.common,1.72,1.73
Paul W. Frields (pfrields)
fedora-docs-commits at redhat.com
Sun Feb 26 22:41:01 UTC 2006
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11103/docs-common
Modified Files:
Makefile.common
Log Message:
Use UTF-8 for these targets too, methinks. Also, fix rpm-common to do a more brainful job of automagicking. I love making up words.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Makefile.common 26 Feb 2006 21:42:30 -0000 1.72
+++ Makefile.common 26 Feb 2006 22:40:53 -0000 1.73
@@ -257,7 +257,7 @@
html-nochunks-$(1):: ${DOCBASE}-$(1).html
${DOCBASE}-$(1).html:: ${XMLFILES-${1}} $(1)/fdp-info.xml set-locale-${1}
- ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml
+ LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml
mv $(DOCBASE).html $(DOCBASE)-$(1).html
mkdir -p stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
@@ -316,7 +316,7 @@
pdf-$(1):: ${DOCBASE}-$(1).pdf
${DOCBASE}-$(1).pdf:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
- ${XMLTO} pdf -x $(XSLPDF) $(1)/$(DOCBASE)-$(1).xml
+ LANG=${1}.UTF-8 ${XMLTO} pdf -x $(XSLPDF) $(1)/$(DOCBASE)-$(1).xml
distclean::
${RM} ${DOCBASE}-${1}.pdf
@@ -343,7 +343,7 @@
${XSLTPROC} $(FDPDIR)/docs-common/packaging/strip-for-txt.xsl \
$(1)/$(DOCBASE).lint.xml > $(1)/$(DOCBASE).stripped.xml
rm $(1)/$(DOCBASE).lint.xml
- ${XMLTO} ${XMLTOTXTPOSTOPT} txt $(1)/$(DOCBASE).stripped.xml
+ LANG=$(1).UTF-8 ${XMLTO} ${XMLTOTXTPOSTOPT} txt $(1)/$(DOCBASE).stripped.xml
mv $(DOCBASE).stripped.txt $(DOCBASE)-$(1).txt
rm $(1)/$(DOCBASE).stripped.xml
@@ -715,8 +715,12 @@
rpm-common::
if test $(shell get_latest_revision rpm) = 0 ; then \
+ V=$(shell get_latest_revision doc) ; \
echo "*** Creating revision log entry for rpm ***" ; \
- ROLE=rpm $(MAKE) clog ; \
+ ROLE=rpm ID=1 DETAILS="Update to version $$V" \
+ $(MAKE) clog ; \
+ else \
+ ROLE=rpm ID=1 $(MAKE) clog ; \
fi
${RM} *.rpm
if test $(RPMPREP) != "no" ; then ${MAKE} package-prep ; fi
More information about the Fedora-docs-commits
mailing list