From 6eda1a38f30c60609d242151b61bdc493c4a124c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Sun, 8 Nov 2015 23:40:05 +0100 Subject: [PATCH] deal.II: corrects cmake install --- candi.sh | 1 - deal.II-toolchain/packages/cmake.package | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 () { -- 2.39.5