From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Sun, 8 Nov 2015 22:40:05 +0000 (+0100)
Subject: deal.II: corrects cmake install
X-Git-Tag: v0.8.1~19
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eda1a38f30c60609d242151b61bdc493c4a124c;p=candi.git

deal.II: corrects cmake install
---

diff --git a/candi.sh b/candi.sh
index 20ac6c1..604b5d9 100755
--- a/candi.sh
+++ b/candi.sh
@@ -334,7 +334,6 @@ package_fetch () {
 package_unpack() {
     # First make sure we're in the right directory before unpacking
     cd ${UNPACK_PATH}
-    echo "${UNPACK_PATH}"
     FILE_TO_UNPACK=${DOWNLOAD_PATH}/${NAME}${PACKING}
     
     # Only need to unpack archives
diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package
index 7f5330d..fe16c8a 100644
--- a/deal.II-toolchain/packages/cmake.package
+++ b/deal.II-toolchain/packages/cmake.package
@@ -5,10 +5,10 @@ PACKING=.tar.gz
 CHECKSUM=511db6fe363aa323905e1c06f7b22425
 BUILDCHAIN=ignore
 
-INSTALL_PATH=${INSTALL_PATH}/${NAME}
+INSTALL_PATH=${INSTALL_PATH}
 
 package_specific_install () {
-    cp -rf ${UNPACK_PATH}/${NAME}/* ${INSTALL_PATH}/
+    cp -rf ${UNPACK_PATH}/${EXTRACTSTO} ${INSTALL_PATH}
 }
 
 package_specific_register () {