[pytables] 01/01: d/rules: use "filter" instead of "findstring" for parsing DEB_BUILD_OPTIONS.

Sébastien Villemot sebastien at debian.org
Thu Sep 7 06:32:20 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository pytables.

commit 9d5ee21f50bd9704f6f720f7a4955a5cea002d83
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Sep 7 08:31:42 2017 +0200

    d/rules: use "filter" instead of "findstring" for parsing DEB_BUILD_OPTIONS.
    
    The latter matches substrings, which is not what we want.
---
 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 42f9e8b..bece8f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
 SPHINXOPTS := -D today=\"$(BUILD_DATE)\"
 SPHINXOPTS += -D html_last_updated_fmt=\"$(BUILD_DATE)\"
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
   export CFLAGS ?= -O0
 endif
 
@@ -33,7 +33,7 @@ build-python%:
 
 
 override_dh_auto_build: $(PY3VERS:%=build-python%)
-ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) PWD=$(CURDIR) SPHINXOPTS="$(SPHINXOPTS)"
 	$(MAKE) -C doc PWD=$(CURDIR) SPHINXOPTS="$(SPHINXOPTS)" latexpdf
 	mv doc/build/latex/usersguide-*.pdf doc/usersguide.pdf
@@ -110,7 +110,7 @@ override_dh_install:
 
 	dh_numpy
 	dh_numpy3
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# https://github.com/PyTables/PyTables/issues/485
 	mkdir -p $(CURDIR)/tmp-locales
 	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 \
@@ -155,7 +155,7 @@ override_dh_auto_clean:
 
 
 override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	dh_sphinxdoc -ppython-tables-doc
 	rm -f $(CURDIR)/debian/python-tables-doc/usr/share/doc/python-tables-doc/html/_static/jquery.cookie.js
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git



More information about the debian-science-commits mailing list