From 187cc7c45afc59d14488bf079da6ac92bf0280e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 23 Jan 2006 14:24:34 +0000 Subject: [PATCH] more fixes --- citadel/citadel_dirs.c | 15 +++++++++++++-- citadel/citadel_dirs.h | 3 +++ citadel/debian/changelog | 7 +++++++ citadel/debian/citadel-unixlogin.substvars | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c index 4b04f6a79..a5cf4076d 100644 --- 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; diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h index 2ccf76f0e..cae218532 100644 --- a/citadel/citadel_dirs.h +++ b/citadel/citadel_dirs.h @@ -26,6 +26,9 @@ extern char ctdl_netout_dir[PATH_MAX]; extern char ctdl_netin_dir[PATH_MAX]; extern char ctdl_netcfg_dir[PATH_MAX]; extern char ctdl_bbsbase_dir[PATH_MAX]; +extern char ctdl_sbin_dir[PATH_MAX]; +extern char ctdl_bin_dir[PATH_MAX]; + /* some of the frequently used files */ extern char file_citadel_control[PATH_MAX]; diff --git a/citadel/debian/changelog b/citadel/debian/changelog index 98133136d..223b72113 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,10 @@ +citadel (6.71-1) unstable; urgency=low + + * update to actual Citadel CVS. many new features. see Packages changelog. + + -- Wilfried Goesgens Sat, 21 Jan 2006 19:07:00 +0100 + + citadel (6.70-1) unstable; urgency=low * update to actual Citadel CVS. many new features. see Packages changelog. diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars index 937460727..3c500e0f6 100644 --- a/citadel/debian/citadel-unixlogin.substvars +++ b/citadel/debian/citadel-unixlogin.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.5-1) +shlibs:Depends=libc6 (>= 2.3.5-1), libpam0g (>= 0.76) -- 2.30.2