changes to CONFIGURATION_PATH

- do not manually set the configuration path
- change the default to be under the installation path (only important
if you change the installation path)

diff --git a/candi.sh b/candi.sh
index 61719ca3b768c58f1ea65e188f7962a3de517760..f2d7690145a797cb9fd74dbe0fae0c077b7a52f7 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -630,7 +630,7 @@ 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 CONFIGURATION_PATH=${PREFIX_PATH}/${PROJECT}/share/configuration
+default CONFIGURATION_PATH=${INSTALL_PATH}/configuration
 
 default CLEAN_BUILD=false
 default STABLE_BUILD=true

diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg
index bf218e49a56d7d5a1fd9a8dcafb95e1d877b9a63..2cbf26e15393cf22c30640ca9920c8b5aeb1fcfc 100644 (file)
--- a/project-deal.II-toolchain.cfg
+++ b/project-deal.II-toolchain.cfg
@@ -19,7 +19,7 @@ CLEAN_BUILD=false
 INSTALL_PATH=${PREFIX_PATH}/${PROJECT}
 
 # Where do you want the configuration files placed?
-CONFIGURATION_PATH=${PREFIX_PATH}/${PROJECT}/share/configuration
+#CONFIGURATION_PATH=${INSTALL_PATH}/configuration
 
 #########################################################################
 # Set up mirror server url(s), to speed up downloads, e.g.