summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJulio M. Merino Vidal <jmmv@NetBSD.org>2009-08-21 16:10:26 +0200
committerDaniel Veillard <veillard@redhat.com>2009-08-21 16:10:26 +0200
commita3c674bd06dc403af310a04f51f33b5abbb240c6 (patch)
tree0c80510fe76113a65ae7143679682d9d410f4c9d /configure.in
parentc15693f6f42107bf459b30a50ea1b0ae25958a5e (diff)
downloadlibxslt-a3c674bd06dc403af310a04f51f33b5abbb240c6.tar.gz
libxslt-a3c674bd06dc403af310a04f51f33b5abbb240c6.tar.bz2
libxslt-a3c674bd06dc403af310a04f51f33b5abbb240c6.zip
134754 Configure's --with-html-dir related fixes
* configure.in doc/Makefile.am: fixes --with-html-dir argument handling and adds --with-html-subdir.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in16
1 files changed, 9 insertions, 7 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