Change repository layout.

diff --git a/candi.sh b/candi.sh
index dc1ab887e4b380c2d8e50bd4bcbc6d4fd8197c74..4a6643208a23e0bfa3da459471dfe53eb5cf86c1 100755 (executable)
--- 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 376b9e12156f2955b32c615b1155c5f355eff198..0c34641e5cc7ee9be775e184ec2896de17281d04 100644 (file)
--- 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 1106b4666bc965b9405b274409f09dfb8d01eaa3..3d2c5fcc327358ca5a0bb021433cd02a8c425757 100644 (file)
--- 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 74fc2106aa61d824173e20c52af815a7d29933af..81d72d88d21c2b7d2580322e2403e50a54daa8ce 100644 (file)
--- 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 bd90ca59f3901f685a92def8280e23805e1a2287..1e5417ee9cd571495a49e20fdfb5ab6d656da473 100644 (file)
--- 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 da6dfb3fd02eed2c5e419e9da822bcadc12e0d0a..5549892bd255d60d1e418bc730f0804f87d972a1 100644 (file)
--- 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  \