Use $(filter ...) instead of $(findstring ...)

To properly extract space separated options from DEB_BUILD_OPTIONS.

diff --git a/debian/changelog b/debian/changelog
index eecb539a3301b6d3377e72b6bfa9c1bb36b3ad22..63f3d52f3ece045c8098438cd9b584c958e654a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Properly lstat the correct file when using --root on package upgrade.
     Thanks to Egmont Koblinger. Closes: #281057
   * Print a longer string when a disallowed field value is found when parsing.
+  * Use $(filter ...) instead of $(findstring ...) to extract space separated
+    options from DEB_BUILD_OPTIONS in debian/rules.
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to

diff --git a/debian/rules b/debian/rules
index cccd7d6418e2c9693e6dafa567dd8ab63786be65..8b01638303b513f7e8a131f33d7a8c167c5ba194 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ CFLAGS = -g $(WFLAGS)
 CXXFLAGS = -g $(WFLAGS)
 
 # Disable optimisations if ‘noopt’ found in $DEB_BUILD_OPTIONS
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
        CXXFLAGS += -O0
 else
@@ -66,7 +66,7 @@ build: build-tree/config.status
 check: build
        dh_testdir
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        cd build-tree && $(MAKE) check
 endif