From 93f04e8b7e0247126a7103fcc7f642edf9c8ce14 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 12 Apr 2005 13:02:49 +0000
Subject: [PATCH] Updated for new build environment

---
 docbook/relaxng/docbook/.cvsignore     |  8 +++++---
 docbook/relaxng/docbook/Makefile       | 15 ++++++++-------
 docbook/relaxng/docbook/build/Makefile | 15 ++++++++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/docbook/relaxng/docbook/.cvsignore b/docbook/relaxng/docbook/.cvsignore
index c27ca9b82..814e4efbb 100644
--- a/docbook/relaxng/docbook/.cvsignore
+++ b/docbook/relaxng/docbook/.cvsignore
@@ -1,4 +1,6 @@
-*.rng
-html
-docbook-rng.xml
 RELEASES
+docbook-dtd.xml
+docbook-rng.xml
+docbook.dtd
+docbook.rnc
+docbook.rng
diff --git a/docbook/relaxng/docbook/Makefile b/docbook/relaxng/docbook/Makefile
index c4bcbe677..caa032ad5 100644
--- a/docbook/relaxng/docbook/Makefile
+++ b/docbook/relaxng/docbook/Makefile
@@ -4,6 +4,7 @@ VPATH=src
 .PHONY: tests html
 
 RNCFILES=$(subst $(VPATH)/,,$(wildcard $(VPATH)/*.rnc))
+TOOLS=../tools
 
 all: docbook.rng docbook.dtd
 
@@ -11,7 +12,7 @@ all: docbook.rng docbook.dtd
 
 tests:
 	mkdir -p tests tests/passed
-	cd tests && ../tools/runtests
+	cd tests && ../$(TOOLS)/runtests
 
 # ============================================================
 
@@ -19,14 +20,14 @@ docbook.rng: $(RNCFILES)
 	$(MAKE) -C build $@
 	trang $@ docbook.rnc
 
-docbook-rng.xml: docbook.rng tools/rngdocxml.xsl
-	xsltproc -output $@ tools/rngdocxml.xsl $<
+docbook-rng.xml: docbook.rng $(TOOLS)/rngdocxml.xsl
+	xsltproc -output $@ $(TOOLS)/rngdocxml.xsl $<
 
-docbook-dtd.xml: docbook-rng.xml tools/doc2dtd.xsl
-	xsltproc -output $@ tools/doc2dtd.xsl $<
+docbook-dtd.xml: docbook-rng.xml $(TOOLS)/doc2dtd.xsl
+	xsltproc -output $@ $(TOOLS)/doc2dtd.xsl $<
 
-docbook.dtd: docbook-dtd.xml tools/xml2dtd.xsl
-	xsltproc -output $@ tools/xml2dtd.xsl $<
+docbook.dtd: docbook-dtd.xml $(TOOLS)/xml2dtd.xsl
+	xsltproc -output $@ $(TOOLS)/xml2dtd.xsl $<
 
 # ============================================================
 
diff --git a/docbook/relaxng/docbook/build/Makefile b/docbook/relaxng/docbook/build/Makefile
index ae09cfce8..583a7b4dc 100644
--- a/docbook/relaxng/docbook/build/Makefile
+++ b/docbook/relaxng/docbook/build/Makefile
@@ -6,13 +6,14 @@ MODULES=$(filter-out docbook.rnx,$(filter-out sdocbook.rnx,$(filter-out slides-n
 
 TMPDIR=/tmp/
 TMPFILE=$(TMPDIR)cleanup.rng
-AUGMENT=../tools/augment.xsl
-INCLUDE=../tools/include.xsl
-EXPAND=../tools/expand.xsl
-GROUP=../tools/group.xsl
-FLATTEN=../tools/flatten.xsl
-CLASSIFY=../tools/classify.xsl
-CLEANUP=../tools/cleanup.pl
+TOOLS=../../tools
+AUGMENT=$(TOOLS)/augment.xsl
+INCLUDE=$(TOOLS)/include.xsl
+EXPAND=$(TOOLS)/expand.xsl
+GROUP=$(TOOLS)/group.xsl
+FLATTEN=$(TOOLS)/flatten.xsl
+CLASSIFY=$(TOOLS)/classify.xsl
+CLEANUP=$(TOOLS)/cleanup.pl
 
 .SUFFIXES: .rnc .rng .rnx
 
-- 
2.49.0