[nfft] 08/13: d/rules: use more indicative naming for fftwl detection.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sat Dec 12 14:25:00 UTC 2015


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

ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.

commit de10eeced041161a2ae358139229f7be85e1ea9f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat Dec 12 13:16:24 2015 +0000

    d/rules: use more indicative naming for fftwl detection.
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3695586..560351e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # Detect whether the long-double version of the FFTW library is available for
 # the host architecture. If positive, support for the long-double precision of
 # the NFFT library will be enabled.
-DH_BUILD_NFFTL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
+SYSTEM_FFTWL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
 
 %:
 	dh $@ --parallel --with autoreconf \
@@ -32,7 +32,7 @@ DH_BUILD_NFFTL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
 override_dh_auto_clean-arch:
 	dh_auto_clean --arch --builddirectory=build-nfft
 	dh_auto_clean --arch --builddirectory=build-nfftf
-ifneq "" "$(DH_BUILD_NFFTL)"
+ifneq "" "$(SYSTEM_FFTWL)"
 	dh_auto_clean --arch --builddirectory=build-nfftl
 endif
 
@@ -48,7 +48,7 @@ override_dh_auto_configure-arch:
 		--disable-doxygen-doc \
 		--enable-single \
 		--program-suffix=f
-ifneq "" "$(DH_BUILD_NFFTL)"
+ifneq "" "$(SYSTEM_FFTWL)"
 	dh_auto_configure --builddirectory=build-nfftl -- \
 		$(COMMON_BUILD_OPTIONS) \
 		--disable-doxygen-doc \
@@ -64,7 +64,7 @@ override_dh_auto_configure-indep:
 override_dh_auto_build-arch:
 	dh_auto_build --arch --builddirectory=build-nfft
 	dh_auto_build --arch --builddirectory=build-nfftf
-ifneq "" "$(DH_BUILD_NFFTL)"
+ifneq "" "$(SYSTEM_FFTWL)"
 	dh_auto_build --arch --builddirectory=build-nfftl
 endif
 
@@ -76,7 +76,7 @@ override_dh_auto_install-arch:
 		--package=libnfft3-double2
 	dh_auto_install --arch --builddirectory=build-nfftf \
 		--package=libnfft3-single2
-ifneq "" "$(DH_BUILD_NFFTL)"
+ifneq "" "$(SYSTEM_FFTWL)"
 	dh_auto_install --arch --builddirectory=build-nfftl \
 		--package=libnfft3-long2
 endif
@@ -89,7 +89,7 @@ ifeq (,$(filter armel mips, $(DEB_HOST_ARCH)))
 	dh_auto_test --builddirectory=build-nfft
 # The testsuite for the long-double precision is disabled due to a bug
 # upstream: https://github.com/NFFT/nfft/issues/16.
-#ifeq "" "$(DH_BUILD_NFFTL)"
+#ifneq "" "$(SYSTEM_FFTWL)"
 #	dh_auto_test --builddirectory=build-nfftl
 #endif
 endif

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



More information about the debian-science-commits mailing list