[caffe] 125/249: d/rules: try to fix build failure

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit e8eed0f3ce1d2ed6e20e98844aebd7fe067f0432
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Sep 1 08:00:21 2015 +0000

    d/rules: try to fix build failure
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4ae6ee2..3854842 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,7 @@ CONFFLAG_CPU = \
 	-DBUILD_matlab=OFF \
 	-DBUILD_docs=ON \
 	-DBUILD_python_layer=ON \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DCMAKE_INSTALL_PREFIX=caffe-cpu
+	-DCMAKE_VERBOSE_MAKEFILE=ON
 CONFFLAG_CUDA = \
 	-DBLAS="Open" \
 	-DCMAKE_SKIP_RPATH=TRUE \
@@ -43,7 +42,6 @@ CONFFLAG_CUDA = \
 	-DBUILD_docs=ON \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DCMAKE_INSTALL_PREFIX=caffe-cuda \
 	-DCUDA_ARCH_NAME="All" \
 	# CUDA 6.5.14 only works with gcc (<= 4.9)
 	-DCMAKE_CXX_COMPILER=g++-4.9 \
@@ -73,9 +71,11 @@ override_dh_auto_clean:
 	-$(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

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