more fixes

[citadel.git] / citadel / citadel_dirs.c

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index 4b04f6a79e519c8adb673aa5118e97b16f81b781..a5cf4076d2fde68e207480669408afbc73dc768b 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -44,6 +44,8 @@ char ctdl_spool_dir[PATH_MAX]="network";
 char ctdl_netout_dir[PATH_MAX]="network/spoolout";
 char ctdl_netin_dir[PATH_MAX]="network/spoolin";
 char ctdl_netcfg_dir[PATH_MAX]="netconfigs";
+char ctdl_sbin_dir[PATH_MAX];
+char ctdl_bin_dir[PATH_MAX];
 
 /* some of our files, that are needed in several places */
 char file_citadel_control[PATH_MAX]="";
@@ -80,8 +82,17 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        const char* basedir;
        char dirbuffer[PATH_MAX]="";
 
-
-
+       /*
+        * Ok, we keep our binaries either in the citadel base dir,
+        * or in /usr/sbin / /usr/bin
+        */
+#ifdef HAVE_ETC_DIR
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin/");
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin/");
+#else
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin");
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin");
+#endif
 
 #ifndef HAVE_ETC_DIR
        basedir=ctdldir;