aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-09-14 23:09:24 +0200
committerVegard Sjonfjell <vegardsjo@gmail.com>2016-09-14 23:09:24 +0200
commit40a0c95e607ed054d3fca3c2d8ca95b134a78634 (patch)
tree870e971dc46f3b030beb9fc15661e9384be7f398 /dist
parent7aac55e577fb431b0ac3cf461fff770b63b0d51d (diff)
/opt/vespa -> /opt/yahoo/vespa (#648)
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index a6e3745b2eb..9a2baa2119a 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -3,7 +3,7 @@
%define __jar_repack %{nil}
# Force special prefix for Vespa
-%define _prefix /opt/vespa
+%define _prefix /opt/yahoo/vespa
Name: vespa
Version: VESPA_VERSION
@@ -65,9 +65,9 @@ sh bootstrap.sh
mvn install -DskipTests -Dmaven.javadoc.skip=true
cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DJAVA_HOME=/usr/lib/jvm/java-openjdk \
- -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm" \
- -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include" \
- -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \
+ -DEXTRA_LINK_DIRECTORY="/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib64/llvm" \
+ -DEXTRA_INCLUDE_DIRECTORY="/opt/yahoo/vespa-boost/include;/opt/yahoo/vespa-libtorrent/include;/opt/yahoo/vespa-zookeeper-c-client/include;/opt/yahoo/vespa-cppunit/include" \
+ -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \
-DCMAKE_BUILD_RPATH=%{_prefix}/lib64 \
.