X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdebian%2Frules;h=4c651a403fc6fe151758504c12f5b23916dd3c56;hb=c1cf1c8630e59eab79e4eea45ed82a5f71edd0d4;hp=48711d6538d8371f225229338d5281e4a39f307f;hpb=736a9a525613ad7849515c5b5e03b4c1cc3cac0e;p=citadel.git

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 48711d653..4c651a403 100755
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -10,28 +10,47 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0 -ggdb
+
+EXTRA_ARGS=
+PROFILE_ARGS=
+#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff"
+ifneq (,$(findstring profiling,$(DEB_BUILD_OPTIONS)))
+	PROFILE_ARGS= --with-gprof
+endif
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0 -ggdb -rdynamic -D_GNU_SOURCE -MD -MP 
+	EXTRA_ARGS = --with-backtrace
 else
 	CFLAGS += -O2
 endif
 
+ifneq (,$(findstring threadoff,$(DEB_BUILD_OPTIONS)))
+	THREAD_ARGS=--without-threaded-client
+else
+	THREAD_ARGS=
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
 	CFLAGS="$(CFLAGS)" ./configure \
+		--with-prefix=/var/lib/citadel \
 		--with-datadir=/var/lib/citadel \
+		--with-staticdatadir=/usr/share/citadel-server \
 		--with-spooldir=/var/spool/citadel \
 		--with-sysconfdir=/etc/citadel \
 		--with-rundir=/var/run/citadel \
 		--with-docdir=/usr/share/doc/citadel-doc/ \
+		--with-ssldir=/etc/ssl/citadel/ \
+		--with-utility-bindir=/usr/lib/citadel-server/ \
 		--with-pam \
 		--with-db \
 		--with-zlib \
 		--with-ldap \
 		--with-libical \
-		--with-libsieve
+		--with-libsieve \
+		--enable-debug $(EXTRA_ARGS) $(PROFILE_ARGS) $(THREAD_ARGS)
 
 	touch configure-stamp
 
@@ -52,11 +71,12 @@ build-indep-stamp: configure-stamp
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
 
 	-$(MAKE) distclean
 
 	dh_clean 
+	rm -f config.status config.log
 
 install: install-indep install-arch
 install-indep:
@@ -77,13 +97,14 @@ install-arch:
 
 	$(MAKE) DESTDIR=$(DEB_DESTDIR) install-exec-new install-data-new
 
-	mkdir -p $(DEB_DESTDIR)/usr/lib/citadel-server
-	mv $(DEB_DESTDIR)/usr/sbin/setup \
-		$(DEB_DESTDIR)/usr/lib/citadel-server/
+	install -D -p -m0755 database_cleanup.sh \
+		$(DEB_DESTDIR)/usr/share/doc/citadel-server/examples/database_cleanup.sh
+
+	install -D -p -m0644 docs/welcomemail.html \
+		$(DEB_DESTDIR)/usr/share/doc/citadel-server/welcomemail.html
 
-	mkdir -p $(DEB_DESTDIR)/usr/share/doc/citadel-server/
-	mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/database_cleanup.sh \
-		$(DEB_DESTDIR)/usr/share/doc/citadel-server/
+	install -D -p -m0644 docs/welcomemail.txt \
+		$(DEB_DESTDIR)/usr/share/doc/citadel-server/welcomemail.txt
 
 	dh_install -s --sourcedir=debian/tmp