From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 12 Dec 2008 09:10:16 +0000 (+0100)
Subject: Set CONFIGFILE to /etc/collectd/collectd.conf.
X-Git-Tag: collectd-4.5.1-1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=76a3c70f3b1ab544ac3a267c2c6b1098c8b56b2a;p=pkg-collectd.git

Set CONFIGFILE to /etc/collectd/collectd.conf.
---

diff --git a/debian/changelog b/debian/changelog
index a6e5dff..69ab0cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ collectd (4.5.1-1) experimental; urgency=low
   * debian/rules:
     - Disabled onewire plugin - owfs is not yet available in Debian.
     - Install contrib/snmp-probe-host.px to /usr/share/doc/collectd/examples/.
+    - Set CONFIGFILE to /etc/collectd/collectd.conf.
   * debian/patches:
     - Added perl-uninitialized-var.dpatch - upstream patch to fix an
       uninitialized variable warning causing a FTBFS because of -Werror.
@@ -37,7 +38,7 @@ collectd (4.5.1-1) experimental; urgency=low
   * debian/collectd.init.d:
     - Do not restart collectd if the configuration test fails.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 07 Dec 2008 18:50:32 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 12 Dec 2008 10:09:48 +0100
 
 collectd (4.4.2-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 9095d53..beebe96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,11 @@ CFLAGS = -Wall -g
 # symbols). This is a workaround for this issue.
 CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
 
+# Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to
+# /etc/collectd would be wrong though.
+CPPFLAGS += -UCONFIGFILE
+CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else