| @@ -1,111 +1,111 @@ | | | @@ -1,111 +1,111 @@ |
1 | $NetBSD: patch-aa,v 1.18 2007/08/29 23:26:45 wiz Exp $ | | 1 | $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $ |
2 | | | 2 | |
3 | --- doc/Makefile.in.orig 2007-08-23 11:22:57.000000000 -0400 | | 3 | --- doc/Makefile.in.orig 2008-04-08 13:18:24.000000000 -0400 |
4 | +++ doc/Makefile.in | | 4 | +++ doc/Makefile.in |
5 | @@ -211,7 +211,7 @@ sysconfdir = @sysconfdir@ | | 5 | @@ -210,7 +210,7 @@ top_builddir = @top_builddir@ |
6 | target_alias = @target_alias@ | | 6 | top_srcdir = @top_srcdir@ |
7 | | | 7 | |
8 | # The name of the module. | | 8 | # The name of the module. |
9 | -DOC_MODULE = libxslt-$(VERSION) | | 9 | -DOC_MODULE = libxslt-$(VERSION) |
10 | +DOC_MODULE = libxslt | | 10 | +DOC_MODULE = libxslt |
11 | | | 11 | |
12 | # The top-level SGML file. | | 12 | # The top-level SGML file. |
13 | DOC_MAIN_XML_FILE = libxslt.xml | | 13 | DOC_MAIN_XML_FILE = libxslt.xml |
14 | @@ -221,7 +221,7 @@ DOC_SOURCE_DIR = .. | | 14 | @@ -220,7 +220,7 @@ DOC_SOURCE_DIR = .. |
15 | | | 15 | |
16 | # A file in win32 depends upon two of the doc files | | 16 | # A file in win32 depends upon two of the doc files |
17 | WIN32_DIR = $(top_srcdir)/win32 | | 17 | WIN32_DIR = $(top_srcdir)/win32 |
18 | -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html | | 18 | -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html |
19 | +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) | | 19 | +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) |
20 | PAGES = API.html bugs.html contribs.html FAQ.html docs.html \ | | 20 | PAGES = API.html bugs.html contribs.html FAQ.html docs.html \ |
21 | downloads.html help.html index.html intro.html news.html \ | | 21 | downloads.html help.html index.html intro.html news.html \ |
22 | xsltproc.html xsltproc2.html | | 22 | xsltproc.html xsltproc2.html |
23 | @@ -494,9 +494,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl | | 23 | @@ -498,9 +498,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl |
24 | $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl | | 24 | $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl |
25 | -@(if [ ! -d EXSLT/html ] ; then \ | | 25 | -@(if [ ! -d EXSLT/html ] ; then \ |
26 | mkdir -p EXSLT/html ; fi ) | | 26 | mkdir -p EXSLT/html ; fi ) |
27 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 27 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
28 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 28 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
29 | echo "Rebuilding the HTML Web pages from exslt.html" ; \ | | 29 | echo "Rebuilding the HTML Web pages from exslt.html" ; \ |
30 | - $(bindir)/xsltproc --nonet --html \ | | 30 | - $(bindir)/xsltproc --nonet --html \ |
31 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html \ | | 31 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html \ |
32 | --stringparam dirname EXSLT/ \ | | 32 | --stringparam dirname EXSLT/ \ |
33 | --stringparam libname libexslt \ | | 33 | --stringparam libname libexslt \ |
34 | --stringparam logo_base ../ \ | | 34 | --stringparam logo_base ../ \ |
35 | @@ -507,20 +507,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si | | 35 | @@ -511,20 +511,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si |
36 | $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi ); | | 36 | $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi ); |
37 | | | 37 | |
38 | ../NEWS: $(srcdir)/news.xsl news.html | | 38 | ../NEWS: $(srcdir)/news.xsl news.html |
39 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 39 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
40 | - $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \ | | 40 | - $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \ |
41 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 41 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
42 | + $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/news.xsl \ | | 42 | + $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/news.xsl \ |
43 | news.html > ../NEWS ; fi ); | | 43 | news.html > ../NEWS ; fi ); |
44 | | | 44 | |
45 | libxslt.xsa: $(srcdir)/xsa.xsl news.html | | 45 | libxslt.xsa: $(srcdir)/xsa.xsl news.html |
46 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 46 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
47 | - $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \ | | 47 | - $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \ |
48 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 48 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
49 | + $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/xsa.xsl \ | | 49 | + $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/xsa.xsl \ |
50 | news.html > libxslt.xsa ; fi ); | | 50 | news.html > libxslt.xsa ; fi ); |
51 | | | 51 | |
52 | $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \ | | 52 | $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \ |
53 | $(srcdir)/api.xsl | | 53 | $(srcdir)/api.xsl |
54 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 54 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
55 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 55 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
56 | echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \ | | 56 | echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \ |
57 | - $(bindir)/xsltproc --nonet --html \ | | 57 | - $(bindir)/xsltproc --nonet --html \ |
58 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html \ | | 58 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html \ |
59 | $(srcdir)/api.xsl \ | | 59 | $(srcdir)/api.xsl \ |
60 | xslt.html ; fi ); | | 60 | xslt.html ; fi ); |
61 | -@(if [ -x $(bindir)/xmllint ] ; then \ | | 61 | -@(if [ -x $(bindir)/xmllint ] ; then \ |
62 | @@ -528,9 +528,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a | | 62 | @@ -532,9 +532,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a |
63 | $(bindir)/xmllint --nonet --valid --noout API*.html; fi ); | | 63 | $(bindir)/xmllint --nonet --valid --noout API*.html; fi ); |
64 | | | 64 | |
65 | $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl | | 65 | $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl |
66 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 66 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
67 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 67 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
68 | echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \ | | 68 | echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \ |
69 | - $(bindir)/xsltproc --nonet --html --output EXSLT/ \ | | 69 | - $(bindir)/xsltproc --nonet --html --output EXSLT/ \ |
70 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html --output EXSLT/ \ | | 70 | + $(top_srcdir)/xsltproc/xsltproc --nonet --html --output EXSLT/ \ |
71 | --stringparam libname libexslt \ | | 71 | --stringparam libname libexslt \ |
72 | --stringparam dirname EXSLT/ \ | | 72 | --stringparam dirname EXSLT/ \ |
73 | --stringparam logo_base ../ \ | | 73 | --stringparam logo_base ../ \ |
74 | @@ -538,9 +538,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si | | 74 | @@ -542,9 +542,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si |
75 | EXSLT/exslt.html ; fi ); | | 75 | EXSLT/exslt.html ; fi ); |
76 | | | 76 | |
77 | html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl | | 77 | html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl |
78 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 78 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
79 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 79 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
80 | echo "Rebuilding the HTML pages from the XSLT API" ; \ | | 80 | echo "Rebuilding the HTML pages from the XSLT API" ; \ |
81 | - $(bindir)/xsltproc --nonet \ | | 81 | - $(bindir)/xsltproc --nonet \ |
82 | + $(top_srcdir)/xsltproc/xsltproc --nonet \ | | 82 | + $(top_srcdir)/xsltproc/xsltproc --nonet \ |
83 | $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); | | 83 | $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); |
84 | -@(if [ -x $(bindir)/xmllint ] ; then \ | | 84 | -@(if [ -x $(bindir)/xmllint ] ; then \ |
85 | echo "Validating the resulting XHTML pages" ; \ | | 85 | echo "Validating the resulting XHTML pages" ; \ |
86 | @@ -553,9 +553,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl | | 86 | @@ -557,9 +557,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl |
87 | | | 87 | |
88 | EXSLT/html/index.html: EXSLT/libexslt-api.xml \ | | 88 | EXSLT/html/index.html: EXSLT/libexslt-api.xml \ |
89 | $(srcdir)/newapi.xsl | | 89 | $(srcdir)/newapi.xsl |
90 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ | | 90 | - -@(if [ -x $(bindir)/xsltproc ] ; then \ |
91 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ | | 91 | + -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ |
92 | echo "Rebuilding the HTML pages from the EXSLT API" ; \ | | 92 | echo "Rebuilding the HTML pages from the EXSLT API" ; \ |
93 | - $(bindir)/xsltproc --nonet --output EXSLT/ \ | | 93 | - $(bindir)/xsltproc --nonet --output EXSLT/ \ |
94 | + $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \ | | 94 | + $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \ |
95 | --stringparam libname libexslt \ | | 95 | --stringparam libname libexslt \ |
96 | --stringparam dirname EXSLT/ \ | | 96 | --stringparam dirname EXSLT/ \ |
97 | --stringparam logo_base ../../ \ | | 97 | --stringparam logo_base ../../ \ |
98 | @@ -577,22 +577,22 @@ xsltproc.1: xsltproc.xml | | 98 | @@ -581,22 +581,22 @@ xsltproc.1: xsltproc.xml |
99 | # Note that in the following, xmllint output is piped to xsltproc | | 99 | # Note that in the following, xmllint output is piped to xsltproc |
100 | search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \ | | 100 | search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \ |
101 | $(srcdir)/search.xml $(srcdir)/search.php.inc | | 101 | $(srcdir)/search.xml $(srcdir)/search.php.inc |
102 | - -@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \ | | 102 | - -@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \ |
103 | + -@(if test -x $(bindir)/xmllint -a -x $(top_srcdir)/xsltproc/xsltproc; then \ | | 103 | + -@(if test -x $(bindir)/xmllint -a -x $(top_srcdir)/xsltproc/xsltproc; then \ |
104 | echo "Rebuilding search.php" ; \ | | 104 | echo "Rebuilding search.php" ; \ |
105 | $(bindir)/xmllint --xinclude --nonet \ | | 105 | $(bindir)/xmllint --xinclude --nonet \ |
106 | $(srcdir)/search.xml | \ | | 106 | $(srcdir)/search.xml | \ |
107 | - $(bindir)/xsltproc --nonet - search.templ \ | | 107 | - $(bindir)/xsltproc --nonet - search.templ \ |
108 | + $(top_srcdir)/xsltproc/xsltproc --nonet - search.templ \ | | 108 | + $(top_srcdir)/xsltproc/xsltproc --nonet - search.templ \ |
109 | > search.php ; else \ | | 109 | > search.php ; else \ |
110 | echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi) | | 110 | echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi) |
111 | | | 111 | |