paalied patch from Julio M. Merino Vidal fixing bug #134751 to fix
* configure.in doc/Makefile.am include/libxml/Makefile.am:
paalied patch from Julio M. Merino Vidal fixing bug #134751
to fix --with-html-dir option.
* doc/*: rebuilt fully the docs
* doc/html/libxml-xmlsave.html: new file from new header.
Daniel
diff --git a/configure.in b/configure.in
index 6acc92d..07d6fa5 100644
--- a/configure.in
+++ b/configure.in
@@ -24,9 +24,6 @@
AM_INIT_AUTOMAKE(libxml2, $VERSION)
-AC_ARG_WITH(html-dir,
-[ --with-html-dir=PATH path to installed docs ])
-
dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
@@ -158,11 +155,14 @@
])
dnl Specific dir for HTML output ?
-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)