From f6bbfa3877f835e5fec3e2f7a148236728781ba5 Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Sun, 26 Feb 2006 22:40:53 +0000
Subject: 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.

---
 Makefile.common | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 47c9685..810460e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -257,7 +257,7 @@ define	HTMLNOCHUNK_template
 
 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 @@ define	PDF_template
 
 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 @@ ${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
 	${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 @@ package-prep::
 
 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
-- 
cgit