collection4.install, rules: Install config into /etc/collection4/.

diff --git a/debian/collection4.install b/debian/collection4.install
index 828cbcdbbb3f534fca4c3e7820c0ae333dabcc2d..b5c6782eef4200db4080e90f486eb72aad571c9e 100644 (file)
--- a/debian/collection4.install
+++ b/debian/collection4.install
@@ -1,5 +1,5 @@
 ../apache.conf etc/collection4/
-etc/
+etc/*.conf etc/collection4/
 usr/bin/*.fcgi usr/lib/collection4/
 usr/share/*.css usr/share/collection4/
 usr/share/*.js usr/share/collection4/

diff --git a/debian/rules b/debian/rules
index 64b6fb0a8847937d64ca755c78f49483118068a3..c13a89f42984bdf21920de2a6294293232bb7379 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ include /usr/share/quilt/quilt.make
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -UCONFIGFILE -DCONFIGFILE='\"/etc/collection4/collection.conf\"'
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0