X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdebian%2Frules;h=76881bef5d3c99974de73599f0cf2574f4387b25;hb=c82a9b990b775ffd78b18925dbc00c7bb06e0a24;hp=f97e5d04ebb25b4f843cd43fe856a8315b67aec4;hpb=89ecfe7ba123b7677a6a7e494a1d12948663ff72;p=citadel.git

diff --git a/webcit/debian/rules b/webcit/debian/rules
index f97e5d04e..76881bef5 100755
--- a/webcit/debian/rules
+++ b/webcit/debian/rules
@@ -18,6 +18,7 @@ DESTDIR=$(CURDIR)/debian/citadel-webcit
 EXTRA_ARGS=
 PROFILE_ARGS=
 COMPILER=
+CFLAGS= 
 #to enable debugging: export DEB_BUILD_OPTIONS="debug profiling compression urldebug iodbg clang"
 
 ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
@@ -28,7 +29,7 @@ ifneq (,$(findstring profiling,$(DEB_BUILD_OPTIONS)))
 	LDFLAGS += -pg 
 endif
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0 -ggdb -rdynamic -MD -MP -D TECH_PREVIEW -pedantic -Wformat-nonliteral
+	CFLAGS += -O0 -ggdb -rdynamic -MD -MP -D TECH_PREVIEW -pedantic -Wformat-nonliteral -Wmaybe-uninitialized -Wunused-variable
 	EXTRA_ARGS =  --with-backtrace
 else
 	CFLAGS += -O2
@@ -51,7 +52,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	CC=$(COMPILER) CFLAGS="$(CFLAGS)" ./configure \
+	export CC=$(COMPILER); export CFLAGS=" -Wformat -Werror=format-security $(CFLAGS)"; ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr/sbin/ \
@@ -60,6 +61,7 @@ endif
 		--with-editordir=/usr/share/tinymce/www/ \
 		--with-rundir=/var/run/citadel \
                 --with-ssldir=/etc/ssl/webcit/ \
+		--with-etcdir=/etc/citadel \
 		--with-ssl \
 		--with-datadir=/var/run/citadel \
 		--enable-debug $(EXTRA_ARGS) $(PROFILE_ARGS)
@@ -93,7 +95,7 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	$(MAKE) install-bin install-locale install-wwwdata DESTDIR=$(DESTDIR)
+	$(MAKE) install-bin install-locale install-wwwdata install-cfg DESTDIR=$(DESTDIR)
 	chmod a-x -R $(DESTDIR)/usr/share/citadel-webcit/static/*
 	find $(DESTDIR)/usr/share/locale/ -name webcit.mo -exec chmod a-x {} \;
 	rm $(DESTDIR)/usr/share/citadel-webcit/static/prototype.js