* move utility binaries to /usr/lib/citadel-server/ so we don't get name clashes...

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 052b0a903c1029aa39a38cf7dcd68b4d65770e55..56e48995327cfd7e7c73b13a8fea06eeb636b495 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -29,17 +29,18 @@ EXEEXT=@EXEEXT@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
 NOINST_TARGETS=stress$(EXEEXT)
-SERVER_TARGETS=citserver
+SERVER_TARGETS=citserver$(EXEEXT)
 SERV_MODULES=crc16.o \
        md5.o \
        ical_dezonify.o
 
 include Make_modules
 
-UTIL_TARGETS=aidepost msgform \
-       citmail userlist sendcommand getmail\
+UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
-UTILBIN_TARGETS= base64 setup chkpw chkpwd
+UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
+       chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
+       getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT)
 
 prefix=@prefix@
 srcdir=@srcdir@

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index 1eaa024eaae569d29e9a0f0a850338aed5930b8f..fec88fd24fae25d3ea976c037065ac62142933e6 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -8,12 +8,12 @@ usr/lib/citadel-server/chkpwd
 usr/lib/citadel-server/chkpw
 usr/lib/citadel-server/citserver.unstripped
 usr/lib/citadel-server/migrate_aliases.sh
-usr/sbin/aidepost
+usr/lib/citadel-server/aidepost
 usr/sbin/citmail
 usr/sbin/citserver
-usr/sbin/msgform
+usr/lib/citadel-server/msgform
 usr/sbin/sendcommand
-usr/sbin/userlist
+usr/lib/citadel-server/userlist
 usr/share/doc/citadel-server/examples/database_cleanup.sh
 usr/share/doc/citadel-server/welcomemail.html
 usr/share/doc/citadel-server/welcomemail.txt