fix source so that '-Wformat -Werror=format-security' doesn't stop us from compiling

[citadel.git] / citadel / debian / rules

diff --git a/citadel/debian/rules b/citadel/debian/rules
index ca65f0818a7b10a09590022219c59078244857f0..9bbf9e2c1973afee9e14470a82e2c532660fb690 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -11,7 +11,7 @@ export DH_OPTIONS
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -Werror=format-security 
 
 
 EXTRA_ARGS=
@@ -35,27 +35,29 @@ else
        THREAD_ARGS=
 endif
 
+
+ifneq (,$(findstring iodbg,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -D BIGBAD_IODBG
+endif
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 
        LDFLAGS="$(LDFLAGS)"; CFLAGS="$(CFLAGS)" ./configure \
-               --with-prefix=/var/lib/citadel/ \
+               --prefix=/var/lib/citadel/ \
                --with-datadir=/var/lib/citadel/ \
                --with-helpdir=/usr/share/citadel-server/ \
+               --with-staticdatadir=/etc/citadel/ \
                --with-spooldir=/var/spool/citadel/ \
                --with-sysconfdir=/etc/citadel/ \
                --with-rundir=/var/run/citadel/ \
                --with-docdir=/usr/share/doc/citadel-doc/ \
-               --with-staticdatadir=/etc/citadel/ \
                --with-ssldir=/etc/ssl/citadel/ \
                --with-utility-bindir=/usr/lib/citadel-server/ \
+               --with-autosysconfdir=/var/lib/citadel/data/ \
                --with-pam \
                --with-db \
-               --with-zlib \
-               --with-ldap \
-               --with-libical \
-               --with-libsieve \
                --enable-debug $(EXTRA_ARGS) $(PROFILE_ARGS) $(THREAD_ARGS)
 
        touch configure-stamp
@@ -79,13 +81,13 @@ clean:
        dh_testroot
        rm -f build-arch-stamp build-indep-stamp configure-stamp
 
-       [ ! -f Makefile ] || $(MAKE) distclean
 
        dh_clean 
        rm -f config.status config.log
+#[ ! -f Makefile ] || $(MAKE) distclean
 
 install: install-indep install-arch
-install-indep:
+install-indep: build-indep
        dh_testdir
        dh_testroot
        dh_clean -k -i 
@@ -95,7 +97,7 @@ install-indep:
 
        dh_install -i --sourcedir=debian/tmp
 
-install-arch:
+install-arch: build-arch
        dh_testdir
        dh_testroot
        dh_clean -k -s 
@@ -122,7 +124,8 @@ binary-common:
        dh_installdebconf       
        dh_installinit --name=citadel
        dh_installman
-       dh_strip
+       dh_strip --dbg-package=citadel-dbg
+       dh_link
        dh_compress 
        dh_fixperms
        dh_makeshlibs