Merge from dmanual branch

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index e48cce252c3c2b1517ecc004fb2783f5cdb7611b..80e8e242bfc35b344011513964afcc5f7a85d683 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,11 @@ if test -z "$pkghttpdir"; then
 fi
 AC_SUBST([pkghttpdir])
 
+if test -z "$dochtmldir"; then
+  dochtmldir='$(docdir)/html'
+fi
+AC_SUBST([dochtmldir])
+
 subdirs="scripts lib"
 if test $want_tests = yes; then
   subdirs="${subdirs} libtests"
@@ -823,6 +828,7 @@ AC_CONFIG_FILES([Makefile
                 cgi/Makefile
                 clients/Makefile
                 disobedience/Makefile
+                disobedience/manual/Makefile
                 doc/Makefile
                 templates/Makefile
                 plugins/Makefile