diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-04-03 11:40:47 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-04-03 11:40:47 -0400 |
| commit | 02b7dac1de29b7e323d9457f14b639582d0a2e04 (patch) | |
| tree | 64f8d2f0b8170ec6171bec7c5bec1ff839af562d | |
| parent | b5c2e362c3ae4c932f4acdba13e53d80f63b1777 (diff) | |
bump the ac_prereq and use the docdir var
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 92aea86..a3dbae0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- -AC_PREREQ(2.59) +AC_PREREQ(2.59c) AC_INIT([ConsoleKit], [0.2.1], [mccann@jhu.edu], @@ -199,20 +199,6 @@ fi AC_SUBST(PAM_MODULE_DIR) dnl --------------------------------------------------------------------------- -dnl - Where should we put documentation ? -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(doc-dir, - [AC_HELP_STRING([--with-doc-dir=<dir>], - [directory to install documentation])]) -if ! test -z "$with_doc_dir"; then - DOCDIR="$with_doc_dir/ConsoleKit-$VERSION" -else - DOCDIR="$datadir/doc/ConsoleKit-$VERSION" -fi -AC_SUBST(DOCDIR) - -dnl --------------------------------------------------------------------------- dnl - DocBook Documentation dnl --------------------------------------------------------------------------- diff --git a/doc/Makefile.am b/doc/Makefile.am index c401d96..43802fe 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,7 +12,7 @@ SPEC_XML_FILES = \ if DOCBOOK_DOCS_ENABLED -htmldocdir = $(DOCDIR)/spec +htmldocdir = $(docdir)/spec htmldoc_DATA = ConsoleKit.html ConsoleKit.html : $(SPEC_XML_FILES) |