From 76a3c70f3b1ab544ac3a267c2c6b1098c8b56b2a Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 12 Dec 2008 10:10:16 +0100 Subject: [PATCH] Set CONFIGFILE to /etc/collectd/collectd.conf. --- debian/changelog | 3 ++- debian/rules | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 Sun, 07 Dec 2008 18:50:32 +0100 + -- Sebastian Harl 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 -- 2.30.2