Portability tweaks for the build.

  - pull in cvstools/Makefile.incl, mainly so that we can use
    cvstools/runtrang

  - "trang" -> $(RUNTRANG) so that cvstools/runtrang is used; if
    users don't have trang binary installed, that will find
    trang.jar and run it. Also allows users to manually specify
    what trang they want (e.g., "make RUNTRANG=trang")

  - "clean" target now also removes dbforms* files

  - "clean" target now also does "make -C build clean"

  - "xsltproc" -> $(XSLTPROC)

diff --git a/docbook/relaxng/docbook/Makefile b/docbook/relaxng/docbook/Makefile
index 60869f1ee35275ff69dc88ce20c9f1b847341f7c..6eaab64040179aa0dd79b97f0de3a08a51e8442b 100644 (file)
--- a/docbook/relaxng/docbook/Makefile
+++ b/docbook/relaxng/docbook/Makefile
@@ -1,3 +1,4 @@
+include ../../../cvstools/Makefile.incl
 VPATH=src
 
 .SUFFIXES: .rnc .rng .rnx .dtx .dtd
@@ -5,6 +6,7 @@ VPATH=src
 
 RNCFILES=$(wildcard $(VPATH)/*.rnc)
 TOOLS=../tools
+XSLTPROC=xsltproc
 
 all: docbook.rng docbook.dtd dbforms.rng dbforms.dtd
 
@@ -28,18 +30,18 @@ dbforms.rng: $(RNCFILES)
 .rnc.rng:
        $(MAKE) -C build $@
        cp build/$@ .
-       trang $@ docbook.rnc
+       $(RUNTRANG) $@ docbook.rnc
        sleep 2
        touch $@
 
 .rng.rnx:
-       xsltproc -output $@ $(TOOLS)/rngdocxml.xsl $<
+       $(XSLTPROC) -output $@ $(TOOLS)/rngdocxml.xsl $<
 
 .rnx.dtx:
-       xsltproc -output $@ $(TOOLS)/doc2dtd.xsl $<
+       $(XSLTPROC) -output $@ $(TOOLS)/doc2dtd.xsl $<
 
 .dtx.dtd:
-       xsltproc -output $@ $(TOOLS)/xml2dtd.xsl $<
+       $(XSLTPROC) -output $@ $(TOOLS)/xml2dtd.xsl $<
 
 # ============================================================
 
@@ -50,6 +52,8 @@ tests:
 # ============================================================
 
 clean:
-       rm -f docbook*
+       $(RM) docbook*
+       $(RM) dbforms*
+       $(MAKE) -C build clean
 
 # EOF