* move chkpwd to the utility bin dir, added chkpw to the debs.

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index e4255823c652189c5a591fa544837dffdc3cd906..045b1d190a27f1a747c77c611164a7f8b2fc6bda 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -215,10 +215,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        snprintf(file_chkpwd,
                 sizeof file_chkpwd, 
                 "%schkpwd",
-                ctdl_sbin_dir);
+                ctdl_utilbin_dir);
 
        snprintf(file_base64,
-                sizeof file_chkpwd,
+                sizeof file_base64,
                 "%sbase64",
                 ctdl_utilbin_dir);
 

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index 6918ca4acfc30d0d8a622e82ef6dc07ba8e670f0..2044c915313c9f32662b7cff36ad0a1036a19273 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -4,8 +4,9 @@ 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
+usr/lib/citadel-server/chkpw
 usr/sbin/aidepost
-usr/sbin/chkpwd
 usr/sbin/citmail
 usr/sbin/citserver
 usr/sbin/msgform

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 20967eb0c54194bc390381c07b1440c52cbd0133..e8a39e3108d80ccb7031b2c6243ebbf6384e0984 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -10,11 +10,11 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0 -ggdb
-else
-       CFLAGS += -O2
-endif
+#else
+#      CFLAGS += -O2
+#endif
 
 configure: configure-stamp
 configure-stamp: