[caffe] 165/249: d/rules: try to fix rules

[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 5e8e9ca155250bed5e8da54a2c1496797ff57159
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 02:55:06 2015 +0000

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

diff --git a/debian/rules b/debian/rules
index 3254744..7cf44ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ CONFFLAG_CUDA = \
 	-DCUDA_ARCH_NAME="All" \
 	-DCMAKE_CXX_COMPILER=g++-4.9 \
 	-DCMAKE_C_COMPILER=gcc-4.9 \
-	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
+	-DCMAKE_INSTALL_PREFIX="/caffe_cuda"
 
 %:
 	dh $@ \
@@ -92,13 +92,15 @@ ifeq (y, $(flag_build_caffe_cuda))
 endif
 
 override_dh_auto_install:
+	sed -i -e '1i\set(CMAKE_INSTALL_CONFIG_NAME "Release")' \
+		${CAFFE_CPU_BUILDDIR}/cmake_install.cmake
 	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
-		-- install \
-		CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+		-- install
 ifeq (y, $(flag_build_caffe_cuda))
+	sed -i -e '1i\set(CMAKE_INSTALL_CONFIG_NAME "Release")' \
+		${CAFFE_CUDA_BUILDDIR}/cmake_install.cmake
 	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- install \
-		CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+		-- install
 endif
 
 get-orig-source:

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