From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 4 Jun 2011 20:00:33 +0000 (+0200)
Subject: collection4.install, rules: Install config into /etc/collection4/.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d4e28e10c0b0cfb4de3edd570727aa4cade7c47;p=pkg-collection4.git

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

diff --git a/debian/collection4.install b/debian/collection4.install
index 828cbcd..b5c6782 100644
--- 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 64b6fb0..c13a89f 100755
--- 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