deal.II: corrects cmake install

diff --git a/candi.sh b/candi.sh
index 20ac6c1e19d0efa9234a2fd446b8586cb27de0a3..604b5d9a698a864ea045d0e7067614a67dfe7586 100755 (executable)
--- 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 7f5330d218985c8aa9bc8d9f23b2ad1c112c248d..fe16c8a50a38fbb5683d7392e508f15d0b919cbe 100644 (file)
--- 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 () {