From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sun, 10 Sep 2006 14:25:32 +0000 (+0000)
Subject: Fixed reference.txt build. Changed build such that reference.pdf
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e719b932e8837573073b6dfb9f65334e3edc0237;p=docbook-dsssl

Fixed reference.txt build. Changed build such that reference.pdf
is always built except for snapshot releases. Added reference.fo
to list of files that are excluded from packaging.
---

diff --git a/xsl/Makefile b/xsl/Makefile
index 2baaba152..f206ef012 100644
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -12,7 +12,7 @@ DISTRIB_DEPENDS = doc docsrc install.sh
 # value of ZIP_EXCLUDES is a space-separated list of any file or
 # directory names (shell wildcards OK) that should be excluded
 # from the zip file and tarball for the release
-DISTRIB_EXCLUDES = extensions/xsltproc doc/reference.txt$$ doc/reference.pdf$$
+DISTRIB_EXCLUDES = extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$
 
 # value of DISTRIB_PACKAGES is a space-separated list of any
 # directory names that should be packaged as separate zip/tar
@@ -46,7 +46,7 @@ docsrc: base website slides
 	$(MAKE) -C docsrc
 
 doc: docsrc
-	$(MAKE) -C doc
+	$(MAKE) -C doc RELVER=$(RELVER)
 
 website:
 	$(MAKE) -C ../website/xsl
diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 909ec69cf..853440689 100644
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -18,7 +18,12 @@ VPATH=../docsrc
 
 DIRS=common refentry lib html fo manpages wordml slides website template
 
+# build reference.pdf.gz except for snapshot releases
+ifneq (snapshot,$(findstring snapshot,$(RELVER)))
+all: reference.txt.gz reference.pdf.gz html
+else
 all: reference.txt.gz html
+endif
 
 html: base copyright.html warranty.html reference.html index.html
 
@@ -50,8 +55,11 @@ reference.fo: ../docsrc/reference.dbk $(REFERENCEFOXSL)
 reference.pdf: reference.fo
 	$(XEP) $(XEPFLAGS) $<
 
-reference.txt: ../docsrc/reference.dbk $(REFERENCETXTXSL)
-	$(XSLTPROC) --xinclude $(REFERENCETXTXSL) $< | $(TXT_MAKER) $(TXT_MAKER_FLAGS) > $@
+reference.txt.html: ../docsrc/reference.dbk $(REFERENCETXTXSL)
+	$(XSLTPROC) --xinclude $(REFERENCETXTXSL) $< > $@
+
+reference.txt: reference.txt.html
+	$(TXT_MAKER) $(TXT_MAKER_FLAGS) $< > $@
 
 reference.pdf.gz: reference.pdf
 	cat $< | $(GZIP) $(GZIPFLAGS) > $@