From 2dd9447702540f31218aa5810bd915b8c7d43e09 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 11 Oct 2018 16:53:13 +0200 Subject: [PATCH] also fix install path from source --- deal.II-toolchain/packages/cmake.package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 () { -- 2.39.5