* i was wrong on the position of help & message files in lhfs. they belong below...

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 436d973907a83387b75315a254b3e3d6051301f0..b5658ac1530eb9d9482f6c24e52d0a9b6ae3914b 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -230,8 +230,8 @@ install-data-new:
        $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/messages
        @for i in  \
                 `find $(srcdir)/help $(srcdir)/messages  -type f | grep -v .svn`; do \
-               echo $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index 321f00f2b5e3ade4f5ff80e03e3fab338b7dc601..1d72fd70d33a8ec70e99d0a4fa3daa68059120fa 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -105,6 +105,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
 #endif
        COMPUTE_DIRECTORY(ctdl_netcfg_dir);
        COMPUTE_DIRECTORY(ctdl_etc_dir);
+       COMPUTE_DIRECTORY(ctdl_hlp_dir);
+       COMPUTE_DIRECTORY(ctdl_message_dir);
 
 #ifndef HAVE_RUN_DIR
        basedir=ctdldir;
@@ -122,10 +124,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        COMPUTE_DIRECTORY(ctdl_bb_dir);
        COMPUTE_DIRECTORY(ctdl_data_dir);
        COMPUTE_DIRECTORY(ctdl_file_dir);
-       COMPUTE_DIRECTORY(ctdl_hlp_dir);
        COMPUTE_DIRECTORY(ctdl_image_dir);
        COMPUTE_DIRECTORY(ctdl_info_dir);
-       COMPUTE_DIRECTORY(ctdl_message_dir);
        COMPUTE_DIRECTORY(ctdl_usrpic_dir);
        COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
 #ifndef HAVE_SPOOL_DIR