The following commit has been merged in the master branch:
commit c57f7db8fec17e073383d0074f94527a6d5f49ea
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Jul 6 07:47:53 2008 +0300
Use $(filter ...) instead of $(findstring ...)
To properly extract space separated options from DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index eecb539..63f3d52 100644
--- 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 cccd7d6..8b01638 100755
--- 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
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
