[caffe-contrib] 310/362: rules: use Makefile variables

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 4764a25662ba15e21efc4ab495bf7a57b48e4dbb
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 11:07:36 2016 +0000

    rules: use Makefile variables
---
 debian/rules | 65 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/debian/rules b/debian/rules
index 77a3dfe..75671fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,8 @@ RULES         := debian/rules
 ORIG_SOURCE   := "https://github.com/BVLC/caffe/archive/rc2.tar.gz"
 CAFFE_SOVER   := "1.0.0-rc3"
 
-export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
-export CAFFE_CUDA_BUILDDIR="caffe_cuda_build"
-
+CAFFE_CPU_BUILDDIR  := "caffe_cpu_build"
+CAFFE_CUDA_BUILDDIR := "caffe_cuda_build"
 SUITE_CPU    := caffe-cpu  libcaffe-cpu0  libcaffe-cpu-dev  python-caffe-cpu
 SUITE_CUDA   := caffe-cuda libcaffe-cuda0 libcaffe-cuda-dev python-caffe-cuda
 SUITE_CPU_P  := $(foreach PKG, $(SUITE_CPU),  --package=$(PKG))
@@ -97,39 +96,39 @@ autogen:
 
 override_dh_auto_configure: autogen
 	dh_auto_configure \
-		--builddirectory=${CAFFE_CPU_BUILDDIR} \
+		--builddirectory=$(CAFFE_CPU_BUILDDIR) \
 		-- $(CONFFLAG_CPU)
 ifeq (y, $(flag_build_caffe_cuda))
 	dh_auto_configure \
-		--builddirectory=${CAFFE_CUDA_BUILDDIR} \
+		--builddirectory=$(CAFFE_CUDA_BUILDDIR) \
 		-- $(CONFFLAG_CUDA)
 endif	
 
 override_dh_auto_clean:
-	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
-	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
-	#-$(RM) -rf ${CAFFE_CPU_BUILDDIR} ${CAFFE_CUDA_BUILDDIR}
+	dh_auto_clean --builddirectory=$(CAFFE_CPU_BUILDDIR)
+	dh_auto_clean --builddirectory=$(CAFFE_CUDA_BUILDDIR)
+	#-$(RM) -rf $(CAFFE_CPU_BUILDDIR) $(CAFFE_CUDA_BUILDDIR)
 	-$(RM) -rf python/caffe/proto/
 	-$(RM) python/caffe/_caffe.so
 
 override_dh_auto_build:
-	dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR} \
+	dh_auto_build --builddirectory=$(CAFFE_CPU_BUILDDIR) \
 		-- all caffe pycaffe
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+	dh_auto_build --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
 		-- all caffe pycaffe
 endif
 
 # In the test phase, we need to set LD_LIBRARY_PATH properly
 # for those test ELFs linked with libcaffe.so.X
 override_dh_auto_test: 
-	dh_auto_test --builddirectory=${CAFFE_CPU_BUILDDIR} \
-		-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
+	dh_auto_test --builddirectory=$(CAFFE_CPU_BUILDDIR) \
+		-- runtest LD_LIBRARY_PATH=$(CAFFE_CPU_BUILDDIR)/lib/ 
 ifeq (y, $(flag_build_caffe_cuda))
 	# some i386/amd64 build machines may have no video card
 	# which supports CUDA. Then heading with a dash '-'.
-	-dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/ 
+	-dh_auto_test --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
+		-- runtest LD_LIBRARY_PATH=$(CAFFE_CUDA_BUILDDIR)/lib/ 
 endif
 
 override_dh_python2:
@@ -137,10 +136,10 @@ override_dh_python2:
 	dh_numpy
 
 override_dh_auto_install:
-	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
+	dh_auto_install --builddirectory=$(CAFFE_CPU_BUILDDIR) \
 		-- install --list-missing 
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+	dh_auto_install --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
 		-- install --list-missing 
 endif
 
@@ -189,18 +188,18 @@ custom-cpu:
 	dch "Host Info: `uname -a`"
 	dpkg-source --after-build ./
 	dpkg-source --before-build ./
-	dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
-	mkdir ${CAFFE_CPU_BUILDDIR}
+	dh_auto_clean --builddirectory=$(CAFFE_CPU_BUILDDIR)
+	mkdir $(CAFFE_CPU_BUILDDIR)
 	$(RULES) autogen
-	dh_auto_configure --builddirectory=${CAFFE_CPU_BUILDDIR} -- \
+	dh_auto_configure --builddirectory=$(CAFFE_CPU_BUILDDIR) -- \
 		$(CONFFLAG_CPU_CUSTOM)
-	dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR} -- $(CUSTOM_JOBS) \
+	dh_auto_build --builddirectory=$(CAFFE_CPU_BUILDDIR) -- $(CUSTOM_JOBS) \
 			all caffe pycaffe test.testbin
 	# For Caffe's CPU-ONLY version it should not fail.
-	dh_auto_test --builddirectory=${CAFFE_CPU_BUILDDIR} \
-		-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
-	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} -- install
-	cd ${CAFFE_CPU_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
+	dh_auto_test --builddirectory=$(CAFFE_CPU_BUILDDIR) \
+		-- runtest LD_LIBRARY_PATH=$(CAFFE_CPU_BUILDDIR)/lib/ 
+	dh_auto_install --builddirectory=$(CAFFE_CPU_BUILDDIR) -- install
+	cd $(CAFFE_CPU_BUILDDIR); cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
 	-$(RM) debian/*.symbols
 	fakeroot dh binary $(SUITE_CPU_P)
@@ -209,21 +208,21 @@ custom-cuda:
 	dch "Host Info: `uname -a`"
 	dpkg-source --after-build ./
 	dpkg-source --before-build ./
-	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
-	mkdir ${CAFFE_CUDA_BUILDDIR}
+	dh_auto_clean --builddirectory=$(CAFFE_CUDA_BUILDDIR)
+	mkdir $(CAFFE_CUDA_BUILDDIR)
 	$(RULES) autogen
-	dh_auto_configure --builddirectory=${CAFFE_CUDA_BUILDDIR} -- \
+	dh_auto_configure --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- \
 		$(CONFFLAG_CUDA_CUSTOM)
-	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CUDA_CUSTOM) \
+	cd $(CAFFE_CUDA_BUILDDIR); cmake $(CONFFLAG_CUDA_CUSTOM) \
 			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cuda" ..
-	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} -- $(CUSTOM_JOBS) \
+	dh_auto_build --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- $(CUSTOM_JOBS) \
 			all caffe pycaffe test.testbin
 	# note the '-' sign, some amd64 build machines have no GPU,
 	# so this test is allowed to fail.
-	-dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/ 
-	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} -- install
-	cd ${CAFFE_CUDA_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
+	-dh_auto_test --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
+		-- runtest LD_LIBRARY_PATH=$(CAFFE_CUDA_BUILDDIR)/lib/ 
+	dh_auto_install --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- install
+	cd $(CAFFE_CUDA_BUILDDIR); cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
 		-P cmake_install.cmake
 	-$(RM) debian/*.symbols
 	fakeroot dh binary $(SUITE_CUDA_P)

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