From: Uwe Köcher Date: Mon, 2 Nov 2015 17:56:19 +0000 (+0100) Subject: candi/deal.II: updated unpack and build dirs and optimised candi output X-Git-Tag: v0.8~7^2~14 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a142867e48d185ef8b5335d80b4f0e481653e60;p=candi.git candi/deal.II: updated unpack and build dirs and optimised candi output --- diff --git a/candi.sh b/candi.sh index 3cdf603..1522f11 100755 --- a/candi.sh +++ b/candi.sh @@ -523,8 +523,8 @@ fi default PROJECT=deal.II default DOWNLOAD_PATH=${PREFIX_PATH}/src -default UNPACK_PATH=${PREFIX_PATH}/${PROJECT}/unpack -default BUILD_PATH=${PREFIX_PATH}/${PROJECT}/build +default UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack +default BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build default CLEAN_BUILD=false default INSTALL_PATH=${PREFIX_PATH}/${PROJECT} @@ -581,8 +581,8 @@ if [ -z "${GIVEN_PLATFORM}" ]; then echo echo "Downloading files to: $(prettify_dir ${DOWNLOAD_PATH})" echo "Unpacking files to: $(prettify_dir ${UNPACK_PATH})" - echo "Building projects in: $(prettify_dir ${BUILD_PATH})" - echo "Installing projects in: $(prettify_dir ${INSTALL_PATH})" + echo "Building packages in: $(prettify_dir ${BUILD_PATH})" + echo "Installing packages in: $(prettify_dir ${INSTALL_PATH})" echo echo "Number of at most build processes to use: PROCS=${PROCS}" echo diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg index 5c4b806..41dba32 100644 --- a/project-deal.II-toolchain.cfg +++ b/project-deal.II-toolchain.cfg @@ -95,10 +95,10 @@ MKL=OFF #DOWNLOAD_PATH=${PREFIX_PATH}/src # Where do you want to unpack source files to go? -#UNPACK_PATH=${PREFIX_PATH}/unpack +#UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack # Where do you want the build files to go? -BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build +#BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build # Where do you want the compiled software installed? INSTALL_PATH=${PREFIX_PATH}/${PROJECT}