docs-common Makefile.common,1.110,1.111

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	Makefile.common 
Log Message:
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.


Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- Makefile.common	11 Apr 2006 20:18:03 -0000	1.110
+++ Makefile.common	24 Apr 2006 01:52:18 -0000	1.111
@@ -382,9 +382,7 @@
 .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 @@
 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/