summaryrefslogtreecommitdiffstats
path: root/Makefile.common
diff options
context:
space:
mode:
authorPaul W. Frields <stickster@gmail.com>2006-04-24 01:52:18 +0000
committerPaul W. Frields <stickster@gmail.com>2006-04-24 01:52:18 +0000
commit351898177fc6a3655c05ddc588930800a09e75d4 (patch)
treebbbe49b31cf11c221f1c3e475023e40f7e6fd0cf /Makefile.common
parent36449b89a4a3572b763a35656d3f83b2ceed630b (diff)
downloadfedora-doc-utils-351898177fc6a3655c05ddc588930800a09e75d4.tar.gz
fedora-doc-utils-351898177fc6a3655c05ddc588930800a09e75d4.tar.xz
fedora-doc-utils-351898177fc6a3655c05ddc588930800a09e75d4.zip
Back out silly attempt to retain entities while serializing document. Instead, we should and will parse these entities normally when the POT file is created, so they can be translated like other text.
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common
index fd4f6f4..701e927 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -382,9 +382,7 @@ define HTML_template
.PHONY: html-${1}
html-$(1):: ${DOCBASE}-$(1)/index.html
${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
- LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null >$(1)/$(DOCBASE).xml-parsed
- LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml-parsed
- ${RM} -f $(1)/$(DOCBASE).xml-parsed
+ LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml
mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
@@ -419,9 +417,7 @@ define HTMLNOCHUNK_template
html-nochunks-$(1):: ${DOCBASE}-$(1).html
${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
- LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null > $(1)/$(DOCBASE).xml-parsed
- LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml-parsed
- ${RM} -f $(1)/$(DOCBASE).xml-parsed
+ 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/