From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 1 Jan 2007 17:58:51 +0000 (+0000)
Subject: * i was wrong on the position of help & message files in lhfs. they belong below... 
X-Git-Tag: v7.86~3724
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=12258a46a30c51470e4cfe814d32a8b930c70d36;p=citadel.git

* i was wrong on the position of help & message files in lhfs. they belong below /etc/citadel, thus will be installed and searched there.
---

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 436d97390..b5658ac15 100644
--- 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 321f00f2b..1d72fd70d 100644
--- 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