Tweaks to makefiles for webhelp

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 51efda289b386c4c672a52b5a08279033c9b380e..f48ac21393f0c7d7460ef7f29b6e8ca23b729961 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -28,9 +28,9 @@ zip-ns: zip
 
 # Run xslt on xsl/webhelp/docsrc/readme.xml
        $(XSLT) \
-       -o $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml \
-       $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml \
-       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl 
+       $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \
+       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml 
 # Turn off validation in webhelp:
        sed -i "s/validate=true/validate=false/" \
          $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/build.properties

diff --git a/xsl/webhelp/Makefile b/xsl/webhelp/Makefile
index 324ba2ed190bdee67517ea40bcca81bf2333bc87..bb7ffa2ab0a0d244e5106819818ddb556b4c9776 100644 (file)
--- a/xsl/webhelp/Makefile
+++ b/xsl/webhelp/Makefile
@@ -9,8 +9,9 @@ build-indexer:
        $(ANT) build-indexer
 
 webhelp: docsrc/readme.xml
-       #$(XSLT) $< xsl/webhelp.xsl 
-       #$(ANT) index
+       $(MAKE) -C ../xhtml
+       $(XSLT) $< xsl/webhelp.xsl 
+       $(ANT) index
 
 # TODO: Still need to set things up for single pass profiling support.
 #profile-webhelp-common.xsl: webhelp-common.xsl ../profiling/xsl2profile.xsl