From 5c8e8cb59196039e37ef97627baf5b6357cbb7f5 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 22 Apr 2016 14:09:28 +0100 Subject: [PATCH] change default paths --- candi.cfg | 11 ++++------- candi.sh | 10 +++++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/candi.cfg b/candi.cfg index 445bb20..2eac397 100644 --- a/candi.cfg +++ b/candi.cfg @@ -7,19 +7,16 @@ CLEAN_BUILD=false ######################################################################### # Where do you want the downloaded source files to go? -#DOWNLOAD_PATH=${PREFIX_PATH}/src +#DOWNLOAD_PATH=${PREFIX_PATH}/tmp/src # Where do you want to unpack source files to go? -#UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack +#UNPACK_PATH=${PREFIX_PATH}/tmp/unpack # Where do you want the build files to go? -#BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build +#BUILD_PATH=${PREFIX_PATH}/tmp/build # Where do you want the compiled software installed? -INSTALL_PATH=${PREFIX_PATH}/${PROJECT} - -# Where do you want the configuration files placed? -#CONFIGURATION_PATH=${INSTALL_PATH}/configuration +INSTALL_PATH=${PREFIX_PATH} ######################################################################### # Set up mirror server url(s), to speed up downloads, e.g. diff --git a/candi.sh b/candi.sh index b073179..3bce263 100755 --- a/candi.sh +++ b/candi.sh @@ -39,7 +39,7 @@ TIC_GLOBAL="$(${DATE_CMD} +%s%N)" ################################################################################ # Parse command line input parameters -PREFIX=~/apps/candi +PREFIX=~/deal.ii-candi PROCS=1 while [ -n "$1" ]; do @@ -626,10 +626,10 @@ fi # If any variables are missing, set them to defaults default PROJECT=deal.II-toolchain -default DOWNLOAD_PATH=${PREFIX_PATH}/src -default UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack -default BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build -default INSTALL_PATH=${PREFIX_PATH}/${PROJECT} +default DOWNLOAD_PATH=${PREFIX_PATH}/tmp/src +default UNPACK_PATH=${PREFIX_PATH}/tmp/unpack +default BUILD_PATH=${PREFIX_PATH}/tmp/build +default INSTALL_PATH=${PREFIX_PATH} default CONFIGURATION_PATH=${INSTALL_PATH}/configuration default CLEAN_BUILD=false -- 2.39.5