[caffe-contrib] 118/362: d/rules: fix install prefix

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:21 UTC 2016


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 01b6f481ca0e165ee6a02de99603f2d2a36b98ba
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Sep 1 07:29:26 2015 +0000

    d/rules: fix install prefix
---
 debian/rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index ca0fa85..19bbf5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 RULES         := debian/rules
-TOP           := $(shell pwd)
 ORIG_SOURCE   := "https://github.com/BVLC/caffe/archive/master.tar.gz"
 
 export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
@@ -31,7 +30,7 @@ CONFFLAG_CPU = \
 	-DBUILD_docs=ON \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DCMAKE_INSTALL_PREFIX=$(TOP)/caffe-cpu
+	-DCMAKE_INSTALL_PREFIX=caffe-cpu
 CONFFLAG_CUDA = \
 	-DBLAS="Open" \
 	-DCMAKE_SKIP_RPATH=TRUE \
@@ -44,7 +43,7 @@ CONFFLAG_CUDA = \
 	-DBUILD_docs=ON \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DCMAKE_INSTALL_PREFIX=$(TOP)/caffe-cuda \
+	-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 \

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



More information about the debian-science-commits mailing list