* Applied W. Goegens' dirconfig patch for more install targets

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 90b0b5e9e501896c0e55a71215d083c462e94c58..b332cbc1e6841231a3d8148593000cab7ec6c91f 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -17,6 +17,8 @@ AC_ARG_WITH(datadir,
                        [ if test "x$withval" != "xno" ; then
                                              AC_DEFINE(HAVE_DATA_DIR)
                                                  AC_DEFINE_UNQUOTED(DATA_DIR, "$withval")
+                                                 MAKE_DATA_DIR=$withval
+                                                 AC_SUBST(MAKE_DATA_DIR)
                          fi
                        ]
 )
@@ -27,18 +29,21 @@ AC_ARG_WITH(spooldir,
                        [ if test "x$withval" != "xno" ; then
                                            AC_DEFINE(HAVE_SPOOL_DIR)
                                                AC_DEFINE_UNQUOTED(SPOOL_DIR,"$withval")
+                                               MAKE_SPOOL_DIR=$withval
+                                               AC_SUBST(MAKE_SPOOL_DIR)
                           fi
                        ]
 )
 
 
-
 dnl Checks for the Configdir
 AC_ARG_WITH(sysconfdir, 
                        [  --with-sysconfdir       directory to store the configs under],
                        [ if test "x$withval" != "xno" ; then
                                            AC_DEFINE(HAVE_ETC_DIR)
                                                AC_DEFINE_UNQUOTED(ETC_DIR, "$withval")
+                                               MAKE_ETC_DIR=$withval
+                                               AC_SUBST(MAKE_ETC_DIR)
                          fi
                        ]
 )
@@ -46,10 +51,12 @@ AC_ARG_WITH(sysconfdir,
 
 dnl Checks for the run-dir for the sockets
 AC_ARG_WITH(rundir, 
-                       [  --with-rundir       directory to store the configs under],
+                       [  --with-rundir           directory to store the configs under],
                        [ if test "x$withval" != "xno" ; then
                                            AC_DEFINE(HAVE_RUN_DIR)
                                                AC_DEFINE_UNQUOTED(RUN_DIR, "$withval")
+                                               MAKE_RUN_DIR=$withval
+                                               AC_SUBST(MAKE_RUN_DIR)
                          fi
                        ]
 )
@@ -58,7 +65,7 @@ AC_ARG_WITH(rundir,
 dnl Checks for the Pseudo Random Generator sockets TODO: this keeps being default.
 AC_DEFINE_UNQUOTED(EGD_POOL, "/var/run/egd-pool")
 AC_ARG_WITH(egdpool, 
-                       [  --with-egdpool       the socket from Pseudo Random Generator, defaults to /var/run/egd-pool],
+                       [  --with-egdpool          the socket from Pseudo Random Generator, defaults to /var/run/egd-pool],
                        [ if test "x$withval" != "xno" ; then
                                                AC_DEFINE_UNQUOTED(EGD_POOL, "$withval")
                          fi
@@ -66,6 +73,15 @@ AC_ARG_WITH(egdpool,
 )
 
 
+AC_ARG_WITH(docdir,
+                       [  --with-docdir           where to install the documentation. default: /usr/local/citadel/],
+                       [ if test "x$withval" != "xno" ; then
+                                       MAKE_DOC_DIR=$withval
+                                       AC_SUBST(MAKE_DOC_DIR)
+                         fi
+                       ]
+)
+
 
 
 AC_ARG_ENABLE(autologin, [  --disable-autologin     disable autologin (default is enabled if possible)])