From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Fri, 30 Oct 2015 15:38:21 +0000 (-0500)
Subject: Change repository layout.
X-Git-Tag: v0.8~9^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=766e9f28ec867a731fbf8ff5594e4b2bd9175775;p=candi.git

Change repository layout.
---

diff --git a/candi.sh b/candi.sh
index dc1ab88..4a66432 100755
--- a/candi.sh
+++ b/candi.sh
@@ -531,6 +531,8 @@ default STABLE_BUILD=true
 default USE_SNAPSHOTS=false
 default PACKAGES_OFF=""
 
+INSTALL_PATH=${INSTALL_PATH}/libs
+
 # Check if project was specified correctly
 if [ -d ${PROJECT} ]; then
     if [ -d ${PROJECT}/platforms -a -d ${PROJECT}/packages ]; then
diff --git a/deal.II/packages/boost.package b/deal.II/packages/boost.package
index 376b9e1..0c34641 100644
--- a/deal.II/packages/boost.package
+++ b/deal.II/packages/boost.package
@@ -6,14 +6,14 @@ BUILDCHAIN=custom
 
 package_specific_build () {
     cp -rf ${UNPACK_PATH}/${NAME}/* .
-    ./bootstrap.sh --prefix=${INSTALL_PATH}
+    ./bootstrap.sh --prefix=${INSTALL_PATH}/${NAME}
     echo "using mpi ;" > user-config.jam
     ./b2 -j ${PROCS} --user-config=user-config.jam --build-dir=candi_build_dir link=shared install ${CONFOPTS}
 }
 
 package_specific_register () {
-    export BOOST_ROOT=${INSTALL_PATH}
-    export BOOST_INCLUDEDIR=${INSTALL_PATH}/include
-    export BOOST_LIBRARYDIR=${INSTALL_PATH}/lib
+    export BOOST_ROOT=${INSTALL_PATH}/${NAME}
+    export BOOST_INCLUDEDIR=${INSTALL_PATH}/${NAME}/include
+    export BOOST_LIBRARYDIR=${INSTALL_PATH}/${NAME}/lib
     export BOOST_USE_MULTITHREADED=OFF
 }
diff --git a/deal.II/packages/bzip2.package b/deal.II/packages/bzip2.package
index 1106b46..3d2c5fc 100644
--- a/deal.II/packages/bzip2.package
+++ b/deal.II/packages/bzip2.package
@@ -16,6 +16,6 @@ package_specific_build () {
 }
 
 package_specific_register () {
-    export BZIP2_INCLUDE=${INSTALL_PATH}/include
-    export BZIP2_LIBPATH=${INSTALL_PATH}/lib
+    export BZIP2_INCLUDE=${INSTALL_PATH}/${NAME}/include
+    export BZIP2_LIBPATH=${INSTALL_PATH}/${NAME}/lib
 }
diff --git a/deal.II/packages/dealii.package b/deal.II/packages/dealii.package
index 74fc210..81d72d8 100644
--- a/deal.II/packages/dealii.package
+++ b/deal.II/packages/dealii.package
@@ -5,6 +5,8 @@ SOURCE=https://github.com/dealii/
 PACKING=git
 BUILDCHAIN=cmake
 
+INSTALL_PATH=${INSTALL_PATH}/..
+
 CONFOPTS=" \
 ${DEAL_CONFOPTS} \
 "
diff --git a/deal.II/packages/opencascade.package b/deal.II/packages/opencascade.package
index bd90ca5..1e5417e 100644
--- a/deal.II/packages/opencascade.package
+++ b/deal.II/packages/opencascade.package
@@ -27,12 +27,12 @@ fi
 
 BUILDCHAIN=cmake
 
-CONFOPTS="-D OCE_INSTALL_PREFIX=${INSTALL_PATH} \
+CONFOPTS="-D OCE_INSTALL_PREFIX=${INSTALL_PATH}/${NAME} \
  -D OCE_VISUALISATION=OFF \
  -D OCE_DATAEXCHANGE=ON \
  -D OCE_OCAF=OFF \
 "
 
 package_specific_register () {
-    export OPENCASCADE_DIR=${INSTALL_PATH}/
+    export OPENCASCADE_DIR=${INSTALL_PATH}/${NAME}
 }
diff --git a/deal.II/patches/bzip2-1.0.6.patch b/deal.II/patches/bzip2-1.0.6.patch
index da6dfb3..5549892 100644
--- a/deal.II/patches/bzip2-1.0.6.patch
+++ b/deal.II/patches/bzip2-1.0.6.patch
@@ -22,7 +22,7 @@
  
  # Where you want it installed when you do 'make install'
 -PREFIX=/usr/local
-+PREFIX=${INSTALL_PATH}
++PREFIX=${INSTALL_PATH}/${NAME}
  
  
  OBJS= blocksort.o  \