$NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $

--- doc/Makefile.in.orig	Sun Mar 13 20:45:10 2005
+++ doc/Makefile.in	Tue Mar 22 00:17:59 2005
@@ -210,7 +210,7 @@
 target_alias = @target_alias@
 
 # The name of the module.
-DOC_MODULE = libxslt-$(VERSION)
+DOC_MODULE = libxslt
 
 # The top-level SGML file.
 DOC_MAIN_XML_FILE = libxslt.xml
@@ -220,7 +220,7 @@
 
 # A file in win32 depends upon two of the doc files
 WIN32_DIR = $(top_srcdir)/win32
-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 PAGES = API.html bugs.html contribs.html FAQ.html docs.html \
          downloads.html help.html index.html intro.html news.html \
 	 xsltproc2.html
@@ -493,9 +493,9 @@
 $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
 	 -@(if [ ! -d EXSLT/html ] ; then \
 	   mkdir -p EXSLT/html ; fi )
-	 -@(if [ -x $(bindir)/xsltproc ] ; then \
+	 -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
 	   echo "Rebuilding the HTML Web pages from exslt.html" ; \
-	   $(bindir)/xsltproc --nonet --html \
+	   $(top_srcdir)/xsltproc/xsltproc --nonet --html \
 	   	--stringparam dirname EXSLT/ \
 		--stringparam libname libexslt \
 		--stringparam logo_base ../ \
@@ -506,20 +506,20 @@
 	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
 
 ../NEWS: $(srcdir)/news.xsl news.html
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/news.xsl \
 	    news.html > ../NEWS ; fi );
 
 libxslt.xsa: $(srcdir)/xsa.xsl news.html
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/xsa.xsl \
 	    news.html > libxslt.xsa ; fi );
 
 $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \
 	     $(srcdir)/api.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
 	  echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \
-	  $(bindir)/xsltproc --nonet --html \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet --html \
 			     $(srcdir)/api.xsl \
 			     xslt.html ; fi );
 	-@(if [ -x $(bindir)/xmllint ] ; then \
@@ -527,9 +527,9 @@
 	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
 
 $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
 	  echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \
-	  $(bindir)/xsltproc --nonet --html --output EXSLT/ \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet --html --output EXSLT/ \
 			     --stringparam libname libexslt \
 			     --stringparam dirname EXSLT/ \
 			     --stringparam logo_base ../ \
@@ -537,9 +537,9 @@
 			     EXSLT/exslt.html ; fi );
 
 html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
 	  echo "Rebuilding the HTML pages from the XSLT API" ; \
-	  $(bindir)/xsltproc --nonet \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet \
 			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); 
 	-@(if [ -x $(bindir)/xmllint ] ; then \
 	  echo "Validating the resulting XHTML pages" ; \
@@ -552,9 +552,9 @@
 
 EXSLT/html/index.html: EXSLT/libexslt-api.xml \
 	$(srcdir)/newapi.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
 	  echo "Rebuilding the HTML pages from the EXSLT API" ; \
-	  $(bindir)/xsltproc --nonet --output EXSLT/ \
+	  $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \
 	  		     --stringparam libname libexslt \
 			     --stringparam dirname EXSLT/ \
 			     --stringparam logo_base ../../ \
@@ -576,22 +576,22 @@
 # Note that in the following, xmllint output is piped to xsltproc
 search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
             $(srcdir)/search.xml $(srcdir)/search.php.inc
-	-@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \
+	-@(if test -x $(bindir)/xmllint -a -x $(top_srcdir)/xsltproc/xsltproc; then \
 	   echo "Rebuilding search.php" ; \
 	   $(bindir)/xmllint --xinclude --nonet \
 	                      $(srcdir)/search.xml | \
-	   $(bindir)/xsltproc --nonet - search.templ \
+	   $(top_srcdir)/xsltproc/xsltproc --nonet - search.templ \
 			      > search.php ; else \
 	   echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi)
 
 $(WIN32_DIR)/libxslt.def.src: libxslt-api.xml
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libxslt.def.src \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+	  $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libxslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml ; fi )
 
 $(WIN32_DIR)/libexslt.def.src: EXSLT/libexslt-api.xml
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libexslt.def.src \
+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+	  $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libexslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml ; fi )
 
 clean-local: