deal.II: updated and reordered deal.II project configuration file

diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg
index 41dba326a8c89de89260f64e6a137c29d01f8e37..52812cf3c52211ab0c5f1aa0cb0276d2c564e115 100644 (file)
--- a/project-deal.II-toolchain.cfg
+++ b/project-deal.II-toolchain.cfg
@@ -1,18 +1,31 @@
-# Global configuration variables go here. You will want to tweak this
-# file to suit your needs. If you want to keep local changes that are
-# not overwritten by repository updates, those can be written
-# to local.cfg instead (entries there will override those in this file).
+# Global configuration.
 
 # Meta-project to build
 PROJECT=deal.II-toolchain
 CLEAN_BUILD=false
 
 #########################################################################
-# Set up a (local) mirror server url, to speed up your package downloads:
+
+# Where do you want the downloaded source files to go?
+#DOWNLOAD_PATH=${PREFIX_PATH}/src
+
+# Where do you want to unpack source files to go?
+#UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack
+
+# Where do you want the build files to go?
+#BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build
+
+# Where do you want the compiled software installed?
+INSTALL_PATH=${PREFIX_PATH}/${PROJECT}
+
+#########################################################################
+# Set up mirror server url(s), to speed up downloads, e.g.
+#   MIRROR="${MIRROR} http://server1.org/package_mirror_dir/"
+#   MIRROR="${MIRROR} ftp://server2.org/package_mirror_dir/"
 MIRROR="https://www.ces.clemson.edu/dealii/mirror/"
 
 #########################################################################
-#Choose components of deal.II
+#Choose configuration and components of deal.II
 DEAL_CONFOPTS=" \
 -D CMAKE_BUILD_TYPE=DebugRelease \
 -D DEAL_II_COMPONENT_DOCUMENTATION:BOOL=OFF \
@@ -39,32 +52,12 @@ DEAL_CONFOPTS=" \
 -D DEAL_II_COMPONENT_PARAMETER_GUI=OFF \
 "
 
-# Please add the following path(es) if you wish to use 
-# (self-compiled) versions of them together with deal.II.
-# Make sure, that the coinciding option is setted to "ON".
-# If you want to use the packages from your system, you
-# may not set the variables (usually deal.II is smart enough
-# to recognise them automatically).
-# If you want to install the packages using CANDI,
-# simply set the option to ON and do NOT specify the path,
-# this will be done automatically elsewhere.
-#
-# ARPACK_DIR= 
-# METIS_DIR= 
-# P4EST_DIR= 
-# TRILINOS_DIR= 
-# HDF5_DIR= 
-# PETSC_DIR=
-# SLEPC_DIR=
-# BLAS_DIR=
-# LAPACK_DIR=
-
 #########################################################################
 
 # Install the following deal.II version:
 DEAL_II_VERSION=v8.3.0
 
-# Would you like to build stable versions of projects?
+# Would you like to build stable version of deal.II?
 # If STABLE_BUILD=false, then the development version of deal.II will be
 # installed.
 STABLE_BUILD=true
@@ -78,8 +71,8 @@ fi
 
 # If you want to use Trilions, decide if you want v12.x.x (AUTO) or v11.x.x
 TRILINOS_MAJOR_VERSION=AUTO
-#TRILINOS_MAJOR_VERSION=11
 #TRILINOS_MAJOR_VERSION=12
+#TRILINOS_MAJOR_VERSION=11
 
 #########################################################################
 
@@ -88,17 +81,3 @@ MKL=OFF
 # MKL_DIR=
 # BLAS_DIR=
 # LAPACK_DIR=
-
-#########################################################################
-
-# Where do you want the downloaded source files to go?
-#DOWNLOAD_PATH=${PREFIX_PATH}/src
-
-# Where do you want to unpack source files to go?
-#UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack
-
-# Where do you want the build files to go?
-#BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build
-
-# Where do you want the compiled software installed?
-INSTALL_PATH=${PREFIX_PATH}/${PROJECT}