diff options
| author | Guillem Jover <guillem@debian.org> | 2008-07-08 13:11:39 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2008-07-08 13:11:39 +0000 |
| commit | d6040a1d3a800a407f3ac31b9ee441b53212bb5f (patch) | |
| tree | a8f527702977beff210cf2d3e817a2fc43144892 | |
| parent | 6ac0362e0dafb7f8d255452c1ccdbc51e9c3acb9 (diff) | |
Use $(filter ...) instead of $(findstring ...)
To properly extract space separated options from DEB_BUILD_OPTIONS.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 241cf7c..d46bb56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ gnumach (2:1.3.99.dfsg.cvs20080708-1) UNRELEASED; urgency=low - debian/patches/05_halt_on_panic_flag.patch: Likewise. - debian/patches/13_ide_dma.patch: Likewise. - debian/patches/14_alloc_params.patch: Likewise. + * Use $(filter ...) instead of $(findstring ...) to extract space separated + options from DEB_BUILD_OPTIONS in debian/rules. -- Guillem Jover <guillem@debian.org> Thu, 09 Aug 2007 01:45:22 +0300 diff --git a/debian/rules b/debian/rules index 2ee84f2..2639667 100755 --- a/debian/rules +++ b/debian/rules @@ -17,13 +17,13 @@ DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) CFLAGS = -Wall -g -pipe -fno-strict-aliasing -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) CHECKS := else CHECKS := check-gnumach check-gnumach-dbg |