[arrayfire] 06/08: d/rules: simplify formatting.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed May 4 13:38:53 UTC 2016


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

ghisvail-guest pushed a commit to branch debian/master
in repository arrayfire.

commit 44509d476cc26b58aceef744eea7c8312dd25600
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Apr 27 00:31:50 2016 +0100

    d/rules: simplify formatting.
---
 debian/rules | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 41e4439..5844e87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DEB_CXXFLAGS_MAINT_APPEND += -mno-altivec
 endif
 
 # CMake options common to -arch and -indep builds.
-CMAKE_BUILD_OPTIONS = \
+BUILD_OPTIONS = \
 	-DAF_INSTALL_CMAKE_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/ArrayFire \
 	-DAF_INSTALL_DOC_DIR=/usr/share/doc/libarrayfire-doc \
 	-DAF_INSTALL_EXAMPLE_DIR=/usr/share/doc/libarrayfire-doc/examples \
@@ -41,13 +41,9 @@ CMAKE_BUILD_OPTIONS = \
 
 # Disable build of examples and testsuite if no check requested.
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-CMAKE_BUILD_OPTIONS += \
-	-DBUILD_EXAMPLES=ON \
-	-DBUILD_TEST=ON
+BUILD_OPTIONS += -DBUILD_EXAMPLES=ON -DBUILD_TEST=ON
 else
-CMAKE_BUILD_OPTIONS += \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_TEST=OFF
+BUILD_OPTIONS += -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF
 endif
 
 %:
@@ -59,10 +55,10 @@ override_dh_auto_clean:
 	find $(CURDIR) -name "version.h" -delete
 
 override_dh_auto_configure-arch:
-	dh_auto_configure -- $(CMAKE_BUILD_OPTIONS) -DBUILD_DOCS=OFF
+	dh_auto_configure -- $(BUILD_OPTIONS) -DBUILD_DOCS=OFF
 
 override_dh_auto_configure-indep:
-	dh_auto_configure -- $(CMAKE_BUILD_OPTIONS) -DBUILD_DOCS=ON
+	dh_auto_configure -- $(BUILD_OPTIONS) -DBUILD_DOCS=ON
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

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



More information about the debian-science-commits mailing list