diff options
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | doc/Makefile.am | 52 |
2 files changed, 32 insertions, 36 deletions
diff --git a/configure.in b/configure.in index de904d98..d230e180 100644 --- a/configure.in +++ b/configure.in @@ -86,17 +86,19 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION) # AM_MAINTAINER_MODE -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) - dnl dnl Specific dir for HTML output ? dnl -if test "x$with_html_dir" = "x" ; then - HTML_DIR='$(prefix)/doc' -else - HTML_DIR=$with_html_dir -fi +AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path], + [path to base html directory, default $datadir/doc/html]), + [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) + +AC_ARG_WITH(html-subdir, AC_HELP_STRING([--with-html-subdir=path], + [directory used under html-dir, default $PACKAGE-$VERSION/html]), + [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], + [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"]) + AC_SUBST(HTML_DIR) dnl diff --git a/doc/Makefile.am b/doc/Makefile.am index 06bd13b3..515dfba1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,20 +1,14 @@ ## Process this file with automake to produce Makefile.in -# The name of the module. -DOC_MODULE=libxslt-$(VERSION) - # The top-level SGML file. DOC_MAIN_XML_FILE=libxslt.xml # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=.. -HTML_DIR=$(datadir)/doc - # A file in win32 depends upon two of the doc files WIN32_DIR=$(top_srcdir)/win32 -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html PAGES= API.html bugs.html contribs.html FAQ.html docs.html \ downloads.html help.html index.html intro.html news.html \ xsltproc.html xsltproc2.html @@ -28,7 +22,7 @@ APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \ EAPIPAGES=EXSLT/APIconstructors.html EXSLT/APIfiles.html \ EXSLT/APIfunctions.html EXSLT/APIsymbols.html EXSLT/APIchunk0.html -EXTRA_DIST = \ +EXTRA_DIST = \ api.xsl \ apibuild.py \ EXSLT/*.html \ @@ -66,14 +60,14 @@ $(PAGES): xslt.html $(srcdir)/site.xsl -@(if [ -x $(bindir)/xmllint ] ; then \ echo "Validating the HTML Web pages" ; \ $(bindir)/xmllint --nonet --valid --noout $(PAGES) ; fi ); - + $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl -@(if [ ! -d EXSLT/html ] ; then \ mkdir -p EXSLT/html ; fi ) -@(if [ -x $(bindir)/xsltproc ] ; then \ echo "Rebuilding the HTML Web pages from exslt.html" ; \ $(bindir)/xsltproc --nonet --html \ - --stringparam dirname EXSLT/ \ + --stringparam dirname EXSLT/ \ --stringparam libname libexslt \ --stringparam logo_base ../ \ $(srcdir)/site.xsl \ @@ -117,7 +111,7 @@ html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl -@(if [ -x $(bindir)/xsltproc ] ; then \ echo "Rebuilding the HTML pages from the XSLT API" ; \ $(bindir)/xsltproc --nonet \ - $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); + $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); -@(if [ -x $(bindir)/xmllint ] ; then \ echo "Validating the resulting XHTML pages" ; \ $(bindir)/xmllint --nonet --valid --noout html/*.html ; fi ); @@ -132,7 +126,7 @@ EXSLT/html/index.html: EXSLT/libexslt-api.xml \ -@(if [ -x $(bindir)/xsltproc ] ; then \ echo "Rebuilding the HTML pages from the EXSLT API" ; \ $(bindir)/xsltproc --nonet --output EXSLT/ \ - --stringparam libname libexslt \ + --stringparam libname libexslt \ --stringparam dirname EXSLT/ \ --stringparam logo_base ../../ \ $(srcdir)/newapi.xsl \ @@ -140,14 +134,14 @@ EXSLT/html/index.html: EXSLT/libexslt-api.xml \ -@(if [ -x $(bindir)/xmllint ] ; then \ echo "Validating the resulting XHTML pages" ; \ $(bindir)/xmllint --nonet --valid --noout EXSLT/html/*.html ; fi ); - - + + libxslt-api.xml libxslt-refs.xml EXSLT/libexslt-api.xml \ EXSLT/libexslt-refs.xml: $(srcdir)/apibuild.py $(top_srcdir)/libxslt/*.h \ $(top_srcdir)/libxslt/*.c $(top_srcdir)/libexslt/*.h \ $(top_srcdir)/libexslt/*.c -($(srcdir)/apibuild.py) - + xsltproc.1: xsltproc.xml -@(xsltproc --nonet xsltproc.xml) @@ -161,7 +155,7 @@ search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \ $(bindir)/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 \ @@ -179,20 +173,20 @@ maintainer-clean-local: clean rebuild: api eapi all -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(TARGET_DIR) - -@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(TARGET_DIR) - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)/html - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/EXSLT - -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(TARGET_DIR)/EXSLT - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial - -@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial2 - -@INSTALL@ -m 0644 $(srcdir)/tutorial2/* $(DESTDIR)$(TARGET_DIR)/tutorial2 +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(HTML_DIR) + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html + -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html + -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html + -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(HTML_DIR)/html + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/EXSLT + -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(HTML_DIR)/EXSLT + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial + -@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(HTML_DIR)/tutorial + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial2 + -@INSTALL@ -m 0644 $(srcdir)/tutorial2/* $(DESTDIR)$(HTML_DIR)/tutorial2 dist-hook: (cd $(srcdir) ; tar cvf - *.1 *.html site.xsl news.xsl xsa.xsl \ |