Removed target for building docbook.rng file (static copy is now

under source control in releasetools).

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index c811a81badee9ff3d45f17691f8679f148fb17e6..e6886900f3b97119b07dfe22d3472e0f3c911cae 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -1,4 +1,7 @@
 include ../../releasetools/Variables.mk
+
+XJPARSEFLAGS= -E 0 -w
+
 XSLTOPT=
 PROCOPT=
 
@@ -18,6 +21,9 @@ VPATH=../docsrc
 
 DIRS=common refentry lib html fo manpages roundtrip slides-html slides-fo website template utility pi
 
+%.included: %
+       $(XINCLUDE) $< >$@
+
 # build reference.pdf.gz except for snapshot releases
 ifneq (snapshot,$(findstring snapshot,$(RELVER)))
 all: reference.txt.gz reference.pdf.gz html
@@ -49,14 +55,14 @@ reference.html: reference.xml $(RSTYLE)
 index.html: reference.html
        cp -p $< $@
 
-reference.fo: ../docsrc/reference.dbk $(REFERENCEFOXSL)
-       $(XSLTPROC) --xinclude $(REFERENCEFOXSL) $< > $@
+reference.fo: ../docsrc/reference.dbk.included $(REFERENCEFOXSL)
+       $(XSLT) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
        $(XEP) $(XEPFLAGS) $<
 
-reference.txt.html: ../docsrc/reference.dbk $(REFERENCETXTXSL)
-       $(XSLTPROC) --xinclude $(REFERENCETXTXSL) $< > $@
+reference.txt.html: ../docsrc/reference.dbk.included $(REFERENCETXTXSL)
+       $(XSLT) $< $(REFERENCETXTXSL) > $@
 
 reference.txt: reference.txt.html
        $(TXT_MAKER) $(TXT_MAKER_FLAGS) $< > $@
@@ -83,3 +89,4 @@ clean:
        $(RM) reference.txt.html
        $(RM) reference.pdf.gz
        $(RM) reference.txt.gz
+       $(RM) ../docsrc/reference.dbk.included