From c15a8fc376481a515deef268f7f98ca8f27dffaa Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 28 Jan 2010 22:10:47 +0100 Subject: [PATCH] rules: Replaced all occurrences of 'findstring' with 'filter' statements. This makes sure that we match words rather than substrings. --- debian/changelog | 4 +++- debian/rules | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d04fe34..f746fe2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ collectd (4.9.1-2) unstable; urgency=low disabled accidentally by using findstring (which does a substring match) to compare DEB_BUILD_ARCH with kfreebsd-{amd64,i386}; thanks to ilia kudirov for reporting this (Closes: #567259). + - Replaced all occurrences of 'findstring' with appropriate 'filter' + statements to make sure to match words rather than substrings. - -- Sebastian Harl Thu, 28 Jan 2010 21:58:35 +0100 + -- Sebastian Harl Thu, 28 Jan 2010 22:09:16 +0100 collectd (4.9.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 9ffcc68..94a8045 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL' CPPFLAGS += -UCONFIGFILE CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"' -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 @@ -81,7 +81,7 @@ confflags += --disable-zfs-arc # The static library netstat cannot be linked into shared objects on some # architectures (see bugs #358637, #419684 and #524593 for more details). -ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel)) +ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH))) confflags += --disable-netlink endif @@ -126,7 +126,7 @@ endif # The hppa buildds currently do not keep up with Java related stuff, thus # prevending testing transitions. -ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa)) +ifneq (,$(filter hppa, $(DEB_BUILD_ARCH))) confflags += --disable-java endif -- 2.30.2