From: Timo Heister Date: Thu, 11 Oct 2018 14:53:13 +0000 (+0200) Subject: also fix install path from source X-Git-Tag: v9.0.0~1^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F95%2Fhead;p=candi.git also fix install path from source --- diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package index b633b8d..0a8766b 100644 --- a/deal.II-toolchain/packages/cmake.package +++ b/deal.II-toolchain/packages/cmake.package @@ -18,23 +18,23 @@ if [ ${PLATFORM_OSTYPE} == "linux" ]; then PACKING=.tar.gz CHECKSUM=55e30dd01698e9409b576008fd22394c BUILDCHAIN=ignore - INSTALL_PATH=${INSTALL_PATH}/${NAME} else # configure/make/install NAME=cmake-${VERSION} PACKING=.tar.gz CHECKSUM=d2d554c05fc07cfae7846d2aa205f12a - + if builtin command -v cmake > /dev/null; then # configure/make with cmake (older or newer version already installed) BUILDCHAIN=cmake - else + else # configure/make with autotools BUILDCHAIN=autotools fi fi SOURCE=https://cmake.org/files/v${MAJOR}/ +INSTALL_PATH=${INSTALL_PATH}/${NAME} if [ ${BUILDCHAIN} == "ignore" ]; then package_specific_install () {