X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdebian%2Frules;h=fef1a8bf64bad9fa1b826c56e1602220305e944a;hb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;hp=ef1bb638d199c382837b3bf3675278e0ff0e87d3;hpb=7177cf277e2930f52d6e37fb0739a970eaba9c8d;p=citadel.git

diff --git a/citadel/debian/rules b/citadel/debian/rules
index ef1bb638d..fef1a8bf6 100755
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -10,22 +10,26 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0 -ggdb
-else
-	CFLAGS += -O2
-endif
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0 -ggdb -pg
+#else
+#	CFLAGS += -O2
+#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 \
@@ -57,6 +61,7 @@ clean:
 	-$(MAKE) distclean
 
 	dh_clean 
+	rm -f config.status config.log
 
 install: install-indep install-arch
 install-indep:
@@ -75,21 +80,16 @@ install-arch:
 	dh_clean -k -s 
 	dh_installdirs -s
 
-	$(MAKE) DESTDIR=$(DEB_DESTDIR) \
-		install-exec-new \
-		install-data-new \
-		install-doc-new
-
-	mkdir -p $(DEB_DESTDIR)/usr/lib/citadel-server
-	mv $(DEB_DESTDIR)/usr/sbin/setup \
-		$(DEB_DESTDIR)/usr/lib/citadel-server/
-
-	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/
-	mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.txt \
-		$(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.html \
-		$(DEB_DESTDIR)/usr/share/doc/citadel-server/
+	$(MAKE) DESTDIR=$(DEB_DESTDIR) install-exec-new install-data-new
+
+	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
+
+	install -D -p -m0644 docs/welcomemail.txt \
+		$(DEB_DESTDIR)/usr/share/doc/citadel-server/welcomemail.txt
 
 	dh_install -s --sourcedir=debian/tmp