X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fdebian%2Frules;h=46eecdca869c5cafa0136b225d36774eb46cd2ab;hp=2631d682c5347b9b8d8a0869b5f3c088d7d87f6e;hb=b98d9f087b3a24a9549470ab066c2aea187ecfba;hpb=613aa4c10d0ec1928a5e5b90b6381b2098612f09 diff --git a/webcit/debian/rules b/webcit/debian/rules index 2631d682c..46eecdca8 100755 --- a/webcit/debian/rules +++ b/webcit/debian/rules @@ -29,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 @@ -52,15 +52,17 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CC=$(COMPILER) CFLAGS=" -Wformat -Werror=format-security $(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/ \ --with-wwwdir=/usr/share/citadel-webcit \ --with-localedir=/usr/share/ \ --with-editordir=/usr/share/tinymce/www/ \ + --with-markdowneditordir=/usr/share/citadel-webcit/epic/ \ --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) @@ -94,7 +96,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 install-epic 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