Get rid of the rest of the hardcoded buildtools references and actually use DOCBOOK_SVN

diff --git a/xsl/common/Makefile b/xsl/common/Makefile
index 53f279a950bb72d2d9cfa6d58dd65d011f8aeafd..12b239c471a1b2f54e0fd44d0256aa0be239989b 100644 (file)
--- a/xsl/common/Makefile
+++ b/xsl/common/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 XJPARSEFLAGS= -E 0 -w
 
@@ -9,76 +9,76 @@ SOURCES=af.xml am.xml ar.xml az.xml bg.xml bn.xml bs.xml ca.xml cs.xml cy.xml da
         pt.xml pt_br.xml ro.xml ru.xml sk.xml sl.xml sq.xml sr.xml sr_Latn.xml sv.xml \
         ta.xml th.xml tl.xml tr.xml uk.xml vi.xml xh.xml zh_cn.xml zh_tw.xml
 
-GENSTYLE=../../gentext/xsl/xsl.xsl ../../gentext/locale/en.xml
+GENSTYLE=$(DOCBOOK_SVN)/gentext/xsl/xsl.xsl $(DOCBOOK_SVN)/gentext/locale/en.xml
 
 all: $(SOURCES)
 
-af.xml: ../../gentext/locale/af.xml $(GENSTYLE)
-am.xml: ../../gentext/locale/am.xml $(GENSTYLE)
-ar.xml: ../../gentext/locale/ar.xml $(GENSTYLE)
-az.xml: ../../gentext/locale/az.xml $(GENSTYLE)
-bg.xml: ../../gentext/locale/bg.xml $(GENSTYLE)
-bn.xml: ../../gentext/locale/bn.xml $(GENSTYLE)
-bs.xml: ../../gentext/locale/bs.xml $(GENSTYLE)
-ca.xml: ../../gentext/locale/ca.xml $(GENSTYLE)
-cs.xml: ../../gentext/locale/cs.xml $(GENSTYLE)
-cy.xml: ../../gentext/locale/cy.xml $(GENSTYLE)
-da.xml: ../../gentext/locale/da.xml $(GENSTYLE)
-de.xml: ../../gentext/locale/de.xml $(GENSTYLE)
-el.xml: ../../gentext/locale/el.xml $(GENSTYLE)
-en.xml: ../../gentext/locale/en.xml $(GENSTYLE)
-eo.xml: ../../gentext/locale/eo.xml $(GENSTYLE)
-es.xml: ../../gentext/locale/es.xml $(GENSTYLE)
-et.xml: ../../gentext/locale/et.xml $(GENSTYLE)
-eu.xml: ../../gentext/locale/eu.xml $(GENSTYLE)
-fa.xml: ../../gentext/locale/fa.xml $(GENSTYLE)
-fi.xml: ../../gentext/locale/fi.xml $(GENSTYLE)
-fr.xml: ../../gentext/locale/fr.xml $(GENSTYLE)
-ga.xml: ../../gentext/locale/ga.xml $(GENSTYLE)
-gl.xml: ../../gentext/locale/gl.xml $(GENSTYLE)
-gu.xml: ../../gentext/locale/gu.xml $(GENSTYLE)
-he.xml: ../../gentext/locale/he.xml $(GENSTYLE)
-hi.xml: ../../gentext/locale/hi.xml $(GENSTYLE)
-hr.xml: ../../gentext/locale/hr.xml $(GENSTYLE)
-hu.xml: ../../gentext/locale/hu.xml $(GENSTYLE)
-id.xml: ../../gentext/locale/id.xml $(GENSTYLE)
-it.xml: ../../gentext/locale/it.xml $(GENSTYLE)
-ja.xml: ../../gentext/locale/ja.xml $(GENSTYLE)
-kn.xml: ../../gentext/locale/kn.xml $(GENSTYLE)
-ko.xml: ../../gentext/locale/ko.xml $(GENSTYLE)
-la.xml: ../../gentext/locale/la.xml $(GENSTYLE)
-lt.xml: ../../gentext/locale/lt.xml $(GENSTYLE)
-lv.xml: ../../gentext/locale/lv.xml $(GENSTYLE)
-mn.xml: ../../gentext/locale/mn.xml $(GENSTYLE)
-nl.xml: ../../gentext/locale/nl.xml $(GENSTYLE)
-nn.xml: ../../gentext/locale/nn.xml $(GENSTYLE)
-nb.xml: ../../gentext/locale/nb.xml $(GENSTYLE)
-or.xml: ../../gentext/locale/or.xml $(GENSTYLE)
-pa.xml: ../../gentext/locale/pa.xml $(GENSTYLE)
-pl.xml: ../../gentext/locale/pl.xml $(GENSTYLE)
-pt.xml: ../../gentext/locale/pt.xml $(GENSTYLE)
-pt_br.xml: ../../gentext/locale/pt_br.xml $(GENSTYLE)
-ro.xml: ../../gentext/locale/ro.xml $(GENSTYLE)
-ru.xml: ../../gentext/locale/ru.xml $(GENSTYLE)
-sk.xml: ../../gentext/locale/sk.xml $(GENSTYLE)
-sl.xml: ../../gentext/locale/sl.xml $(GENSTYLE)
-sq.xml: ../../gentext/locale/sq.xml $(GENSTYLE)
-sr.xml: ../../gentext/locale/sr.xml $(GENSTYLE)
-sr_Latn.xml: ../../gentext/locale/sr_Latn.xml $(GENSTYLE)
-sv.xml: ../../gentext/locale/sv.xml $(GENSTYLE)
-ta.xml: ../../gentext/locale/ta.xml $(GENSTYLE)
-tl.xml: ../../gentext/locale/tl.xml $(GENSTYLE)
-th.xml: ../../gentext/locale/th.xml $(GENSTYLE)
-tr.xml: ../../gentext/locale/tr.xml $(GENSTYLE)
-uk.xml: ../../gentext/locale/uk.xml $(GENSTYLE)
-vi.xml: ../../gentext/locale/vi.xml $(GENSTYLE)
-xh.xml: ../../gentext/locale/xh.xml $(GENSTYLE)
-zh_cn.xml: ../../gentext/locale/zh_cn.xml $(GENSTYLE)
-zh_tw.xml: ../../gentext/locale/zh_tw.xml $(GENSTYLE)
+af.xml: $(DOCBOOK_SVN)/gentext/locale/af.xml $(GENSTYLE)
+am.xml: $(DOCBOOK_SVN)/gentext/locale/am.xml $(GENSTYLE)
+ar.xml: $(DOCBOOK_SVN)/gentext/locale/ar.xml $(GENSTYLE)
+az.xml: $(DOCBOOK_SVN)/gentext/locale/az.xml $(GENSTYLE)
+bg.xml: $(DOCBOOK_SVN)/gentext/locale/bg.xml $(GENSTYLE)
+bn.xml: $(DOCBOOK_SVN)/gentext/locale/bn.xml $(GENSTYLE)
+bs.xml: $(DOCBOOK_SVN)/gentext/locale/bs.xml $(GENSTYLE)
+ca.xml: $(DOCBOOK_SVN)/gentext/locale/ca.xml $(GENSTYLE)
+cs.xml: $(DOCBOOK_SVN)/gentext/locale/cs.xml $(GENSTYLE)
+cy.xml: $(DOCBOOK_SVN)/gentext/locale/cy.xml $(GENSTYLE)
+da.xml: $(DOCBOOK_SVN)/gentext/locale/da.xml $(GENSTYLE)
+de.xml: $(DOCBOOK_SVN)/gentext/locale/de.xml $(GENSTYLE)
+el.xml: $(DOCBOOK_SVN)/gentext/locale/el.xml $(GENSTYLE)
+en.xml: $(DOCBOOK_SVN)/gentext/locale/en.xml $(GENSTYLE)
+eo.xml: $(DOCBOOK_SVN)/gentext/locale/eo.xml $(GENSTYLE)
+es.xml: $(DOCBOOK_SVN)/gentext/locale/es.xml $(GENSTYLE)
+et.xml: $(DOCBOOK_SVN)/gentext/locale/et.xml $(GENSTYLE)
+eu.xml: $(DOCBOOK_SVN)/gentext/locale/eu.xml $(GENSTYLE)
+fa.xml: $(DOCBOOK_SVN)/gentext/locale/fa.xml $(GENSTYLE)
+fi.xml: $(DOCBOOK_SVN)/gentext/locale/fi.xml $(GENSTYLE)
+fr.xml: $(DOCBOOK_SVN)/gentext/locale/fr.xml $(GENSTYLE)
+ga.xml: $(DOCBOOK_SVN)/gentext/locale/ga.xml $(GENSTYLE)
+gl.xml: $(DOCBOOK_SVN)/gentext/locale/gl.xml $(GENSTYLE)
+gu.xml: $(DOCBOOK_SVN)/gentext/locale/gu.xml $(GENSTYLE)
+he.xml: $(DOCBOOK_SVN)/gentext/locale/he.xml $(GENSTYLE)
+hi.xml: $(DOCBOOK_SVN)/gentext/locale/hi.xml $(GENSTYLE)
+hr.xml: $(DOCBOOK_SVN)/gentext/locale/hr.xml $(GENSTYLE)
+hu.xml: $(DOCBOOK_SVN)/gentext/locale/hu.xml $(GENSTYLE)
+id.xml: $(DOCBOOK_SVN)/gentext/locale/id.xml $(GENSTYLE)
+it.xml: $(DOCBOOK_SVN)/gentext/locale/it.xml $(GENSTYLE)
+ja.xml: $(DOCBOOK_SVN)/gentext/locale/ja.xml $(GENSTYLE)
+kn.xml: $(DOCBOOK_SVN)/gentext/locale/kn.xml $(GENSTYLE)
+ko.xml: $(DOCBOOK_SVN)/gentext/locale/ko.xml $(GENSTYLE)
+la.xml: $(DOCBOOK_SVN)/gentext/locale/la.xml $(GENSTYLE)
+lt.xml: $(DOCBOOK_SVN)/gentext/locale/lt.xml $(GENSTYLE)
+lv.xml: $(DOCBOOK_SVN)/gentext/locale/lv.xml $(GENSTYLE)
+mn.xml: $(DOCBOOK_SVN)/gentext/locale/mn.xml $(GENSTYLE)
+nl.xml: $(DOCBOOK_SVN)/gentext/locale/nl.xml $(GENSTYLE)
+nn.xml: $(DOCBOOK_SVN)/gentext/locale/nn.xml $(GENSTYLE)
+nb.xml: $(DOCBOOK_SVN)/gentext/locale/nb.xml $(GENSTYLE)
+or.xml: $(DOCBOOK_SVN)/gentext/locale/or.xml $(GENSTYLE)
+pa.xml: $(DOCBOOK_SVN)/gentext/locale/pa.xml $(GENSTYLE)
+pl.xml: $(DOCBOOK_SVN)/gentext/locale/pl.xml $(GENSTYLE)
+pt.xml: $(DOCBOOK_SVN)/gentext/locale/pt.xml $(GENSTYLE)
+pt_br.xml: $(DOCBOOK_SVN)/gentext/locale/pt_br.xml $(GENSTYLE)
+ro.xml: $(DOCBOOK_SVN)/gentext/locale/ro.xml $(GENSTYLE)
+ru.xml: $(DOCBOOK_SVN)/gentext/locale/ru.xml $(GENSTYLE)
+sk.xml: $(DOCBOOK_SVN)/gentext/locale/sk.xml $(GENSTYLE)
+sl.xml: $(DOCBOOK_SVN)/gentext/locale/sl.xml $(GENSTYLE)
+sq.xml: $(DOCBOOK_SVN)/gentext/locale/sq.xml $(GENSTYLE)
+sr.xml: $(DOCBOOK_SVN)/gentext/locale/sr.xml $(GENSTYLE)
+sr_Latn.xml: $(DOCBOOK_SVN)/gentext/locale/sr_Latn.xml $(GENSTYLE)
+sv.xml: $(DOCBOOK_SVN)/gentext/locale/sv.xml $(GENSTYLE)
+ta.xml: $(DOCBOOK_SVN)/gentext/locale/ta.xml $(GENSTYLE)
+tl.xml: $(DOCBOOK_SVN)/gentext/locale/tl.xml $(GENSTYLE)
+th.xml: $(DOCBOOK_SVN)/gentext/locale/th.xml $(GENSTYLE)
+tr.xml: $(DOCBOOK_SVN)/gentext/locale/tr.xml $(GENSTYLE)
+uk.xml: $(DOCBOOK_SVN)/gentext/locale/uk.xml $(GENSTYLE)
+vi.xml: $(DOCBOOK_SVN)/gentext/locale/vi.xml $(GENSTYLE)
+xh.xml: $(DOCBOOK_SVN)/gentext/locale/xh.xml $(GENSTYLE)
+zh_cn.xml: $(DOCBOOK_SVN)/gentext/locale/zh_cn.xml $(GENSTYLE)
+zh_tw.xml: $(DOCBOOK_SVN)/gentext/locale/zh_tw.xml $(GENSTYLE)
 
 %.xml:
        $(XJPARSE) $(XJPARSEFLAGS) $<
-       $(XSLT) ../../gentext/locale/en.xml ../../gentext/xsl/xsl.xsl $@ locale.file=$@
+       $(XSLT) $(DOCBOOK_SVN)/gentext/locale/en.xml $(DOCBOOK_SVN)/gentext/xsl/xsl.xsl $@ locale.file=$@
 
 clean:
        $(RM) $(SOURCES)

diff --git a/xsl/eclipse/Makefile b/xsl/eclipse/Makefile
index f6eeb54c39b8b0eca871b4f2c97e177b25ccbcd2..cd0233e9cc5104aba52c09b270ea3a49216aca1b 100644 (file)
--- a/xsl/eclipse/Makefile
+++ b/xsl/eclipse/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 all: profile-eclipse.xsl
 
 profile-eclipse.xsl: eclipse.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/extensions/Makefile b/xsl/extensions/Makefile
index 573712aa48b314379d272d129ef74a2867de9d74..2c7175f97adac97d075feee939501b41fec46a47 100644 (file)
--- a/xsl/extensions/Makefile
+++ b/xsl/extensions/Makefile
@@ -8,10 +8,10 @@ saxon65.jar: $(DOCBOOK_SVN)/xsl-saxon/saxon65.jar
 xalan27.jar: $(DOCBOOK_SVN)/xsl-xalan/xalan27.jar
        cp -p $^ $@
 
-$(DOCBOOK_SVN)/xsl-saxon/saxon65.jar: $(wildcard ../../xsl-saxon/src/com/nwalsh/saxon/*.java) 
+$(DOCBOOK_SVN)/xsl-saxon/saxon65.jar: $(wildcard $(DOCBOOK_SVN)/xsl-saxon/src/com/nwalsh/saxon/*.java) 
        $(MAKE) -C $(dir $@)
 
-$(DOCBOOK_SVN)/xsl-xalan/xalan27.jar: $(wildcard ../../xsl-xalan/src/com/nwalsh/xalan/*.java) 
+$(DOCBOOK_SVN)/xsl-xalan/xalan27.jar: $(wildcard $(DOCBOOK_SVN)/xsl-xalan/src/com/nwalsh/xalan/*.java) 
        $(MAKE) -C $(dir $@)
 
 xslt.py: $(DOCBOOK_SVN)/xsl-libxslt/python/xslt.py

diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index 21a6b62910b0db4df5c6625e1d65cd1516eaae65..a72a1b1ac1a4df0b700c7c85082674851d9205b9 100644 (file)
--- a/xsl/fo/Makefile
+++ b/xsl/fo/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl profile-docbook.xsl

diff --git a/xsl/htmlhelp/Makefile b/xsl/htmlhelp/Makefile
index feb66241250d581f27f1a77f31dbdc52bbc078ec..ddf55a96d28dd73377a28bcc5ca87dcd84bbef80 100644 (file)
--- a/xsl/htmlhelp/Makefile
+++ b/xsl/htmlhelp/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 all: profile-htmlhelp-common.xsl
 
 profile-htmlhelp-common.xsl: htmlhelp-common.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/javahelp/Makefile b/xsl/javahelp/Makefile
index a16c99752653b40cea2eb1cc0223f3d1ada79400..14675b21c3464e894610851ed4c0228d134f6c64 100644 (file)
--- a/xsl/javahelp/Makefile
+++ b/xsl/javahelp/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 all: profile-javahelp.xsl
 
 profile-javahelp.xsl: javahelp.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/lib/Makefile b/xsl/lib/Makefile
index c0cdc6cad2228161e7f8c7d190aef78075473be6..749dac67caa29c773b563cee4816cd9a9545954c 100644 (file)
--- a/xsl/lib/Makefile
+++ b/xsl/lib/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 PARAMBASE=lib
 XSLFILES=lib.xsl

diff --git a/xsl/roundtrip/Makefile b/xsl/roundtrip/Makefile
index a19379c13b990641f30d29f1689e3cbe113d2e71..1a921af64983e8e4cb542760eee2b4813a15b68e 100644 (file)
--- a/xsl/roundtrip/Makefile
+++ b/xsl/roundtrip/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl

diff --git a/xsl/slides/Makefile b/xsl/slides/Makefile
index d22ede6cfcf6d67c0d7f38c14a08c099a8139a94..e44c30e75bcfa6323adf95b4ca9b28db2265d16c 100644 (file)
--- a/xsl/slides/Makefile
+++ b/xsl/slides/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 DIRS = fo html xhtml
 

diff --git a/xsl/tests/Makefile b/xsl/tests/Makefile
index ec8a0157cb7496faff911bcc0a2617dccc072eed..36f5b590821e4b277f8816b617837f584b14523f 100644 (file)
--- a/xsl/tests/Makefile
+++ b/xsl/tests/Makefile
@@ -2,10 +2,10 @@
 
 all: refentry.007.xml refentry.007.ns.xml
 
-refentry.007.xml: ../../releasetools/refentry.007.xml 
+refentry.007.xml: $(DOCBOOK_SVN)/releasetools/refentry.007.xml 
        cp $< $@
 
-refentry.007.ns.xml: ../../releasetools/refentry.007.ns.xml 
+refentry.007.ns.xml: $(DOCBOOK_SVN)/releasetools/refentry.007.ns.xml 
        cp $< $@
 
 clean:

diff --git a/xsl/website/Makefile b/xsl/website/Makefile
index 7fe2d4c5a4e2c87ea6bef022aab1f9617d91185c..c5b2d7c67c50f198c69111bb5be8ed12adc80180 100644 (file)
--- a/xsl/website/Makefile
+++ b/xsl/website/Makefile
@@ -1,4 +1,4 @@
-include ../../buildtools/Makefile.incl
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl