[opencv] 03/08: more DRY

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository opencv.

commit 99d02354f282eeaf642377c5c867f14e6e42293e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Apr 23 20:45:25 2017 +0200

    more DRY
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/rules | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6fd27c0..c35809b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-# for i386 arch
-ifeq ($(DEB_HOST_ARCH),i386)
-BUILDDIR_ARCH = obj-i686-linux-gnu
-else
-BUILDDIR_ARCH = obj-$(DEB_HOST_MULTIARCH)
-endif
+BUILDDIR = obj-$(DEB_HOST_MULTIARCH)
 
 # SSE options
 ifeq ($(DEB_HOST_ARCH),amd64)
@@ -78,7 +73,7 @@ CMAKE_FLAGS = \
 	-DENABLE_PRECOMPILED_HEADERS=OFF \
 	-DWITH_IPP=OFF \
 	-DOPENCL_INCLUDE_DIR:PATH="/usr/include/CL/" \
-	$(CMAKE_ARCH_FLAGS) 
+	$(CMAKE_ARCH_FLAGS)
 
 %:
 	dh $@ --buildsystem=cmake --with python2,python3,javahelper --parallel
@@ -95,24 +90,24 @@ override_dh_clean:
 
 override_dh_auto_configure: configure_dyn configure_static
 configure_dyn:
-	dh_auto_configure -B $(BUILDDIR_ARCH) \
+	dh_auto_configure -B $(BUILDDIR) \
 		-- $(CMAKE_FLAGS) \
 		-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
 		-DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON
 
 configure_static:
-	dh_auto_configure -B $(BUILDDIR_ARCH)-static \
+	dh_auto_configure -B $(BUILDDIR)-static \
 		-- $(CMAKE_FLAGS) \
 		-DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF
 
 override_dh_auto_build: build_dyn build_static
 	
 build_dyn:
-	dh_auto_build -B $(BUILDDIR_ARCH)
-	dh_auto_build -B $(BUILDDIR_ARCH) -- doxygen
+	dh_auto_build -B $(BUILDDIR)
+	dh_auto_build -B $(BUILDDIR) -- doxygen
 
 build_static:
-	dh_auto_build -B $(BUILDDIR_ARCH)-static
+	dh_auto_build -B $(BUILDDIR)-static
 
 override_dh_auto_test:
 

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