* move messages/ to /etc/ since the admin should edit them.

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 51246189e9fe721b1ca5ec065aa7d589f88ffd3f..ac17fac41a085c4efa0460e444bd986b63acd4f7 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -18,6 +18,7 @@ SPOOL_DIR=@MAKE_SPOOL_DIR@
 ETC_DIR=@MAKE_ETC_DIR@
 DATA_DIR=@MAKE_DATA_DIR@
 STATICDATA_DIR=@MAKE_STATICDATA_DIR@
+HELP_DIR=@MAKE_HELP_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
 UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 DEPEND_FLAG=@DEPEND_FLAG@
@@ -225,13 +226,19 @@ install-data-new:
        $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
        $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/help
        $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
        @for i in  \
-                `find $(srcdir)/help $(srcdir)/messages  -type f | grep -v .svn`; do \
+                `$(srcdir)/messages  -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
+
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
+       @for i in  \
+                `find $(srcdir)/help -type f | grep -v .svn`; do \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
+       done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/systems

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index f4233cefb9f91781dc15f2b3158df955c6137c98..24639ce46c7a4247dda1bf02a6578a73d1e73a32 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -129,7 +129,13 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, const char  *ctd
        basedir=STATICDATA_DIR;
 #endif
        COMPUTE_DIRECTORY(ctdl_hlp_dir);
-       COMPUTE_DIRECTORY(ctdl_message_dir);
+
+#ifndef HAVE_HELP_DIR
+       basedir=ctdldir;
+#else
+       basedir=HELP_DIR;
+#endif
+       COMPUTE_DIRECTORY(ctdl_hlp_dir);
 
 #ifndef HAVE_DATA_DIR
        basedir=ctdldir;

diff --git a/citadel/configure.ac b/citadel/configure.ac
index ee2b7bf096244ef03717e643325d82d1d6cba1db..add01aff0fc4a3dc87ff72a7cfb64774697d6863 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -29,7 +29,20 @@ AC_ARG_WITH(datadir,
                        ]
 )
 
-dnl Checks for the Datadir
+
+dnl Checks for the helpDatadir
+AC_ARG_WITH(helpdir, 
+                   [  --with-helpdir          directory to store the helpfiles under],
+                       [ if test "x$withval" != "xno" ; then
+                                             AC_DEFINE(HAVE_HELP_DIR,[],[use alternate database location?])
+                                             AC_DEFINE_UNQUOTED(HELP_DIR, "$withval",[define, if the user suplied a helpfile-directory to use.])
+                                             MAKE_HELP_DIR=$withval
+                                             AC_SUBST(MAKE_HELP_DIR)
+                         fi
+                       ]
+)
+
+dnl Checks for the Static Datadir
 AC_ARG_WITH(staticdatadir, 
                    [  --with-staticdatadir    directory to store citadels system messages under],
                        [ if test "x$withval" != "xno" ; then

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index b1b88bdf04f7724c0b242573f221fd19cfd40ce9..a6e1b3aae8f2f426336e185ef1e742e1d5b81582 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,9 @@
+citadel (7.38-40) stable; urgency=low
+
+  * new upstream version
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Thu, 11 Sep 2008 18:00:00 +0002
+
 citadel (7.37-39) stable; urgency=low
 
   * new upstream version

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index fec88fd24fae25d3ea976c037065ac62142933e6..b9e463000d3d040308ce602279baf0067c7840dd 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -1,7 +1,7 @@
 etc/citadel/mail.aliases
 etc/citadel/public_clients
+etc/citadel/messages
 usr/share/citadel-server/help
-usr/share/citadel-server/messages
 usr/lib/citadel-server/setup
 usr/lib/citadel-server/base64
 usr/lib/citadel-server/chkpwd

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 1eb7dac98ec0881c737a0aa5d2f7b6c7d929140c..ca65f0818a7b10a09590022219c59078244857f0 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -40,13 +40,14 @@ configure-stamp:
        dh_testdir
 
        LDFLAGS="$(LDFLAGS)"; CFLAGS="$(CFLAGS)" ./configure \
-               --with-prefix=/var/lib/citadel \
-               --with-datadir=/var/lib/citadel \
-               --with-staticdatadir=/usr/share/citadel-server \
-               --with-spooldir=/var/spool/citadel \
-               --with-sysconfdir=/etc/citadel \
-               --with-rundir=/var/run/citadel \
+               --with-prefix=/var/lib/citadel/ \
+               --with-datadir=/var/lib/citadel/ \
+               --with-helpdir=/usr/share/citadel-server/ \
+               --with-spooldir=/var/spool/citadel/ \
+               --with-sysconfdir=/etc/citadel/ \
+               --with-rundir=/var/run/citadel/ \
                --with-docdir=/usr/share/doc/citadel-doc/ \
+               --with-staticdatadir=/etc/citadel/ \
                --with-ssldir=/etc/ssl/citadel/ \
                --with-utility-bindir=/usr/lib/citadel-server/ \
                --with-pam \