update ubuntu instructions

diff --git a/deal.II-toolchain/platforms/supported/ubuntu12.platform b/deal.II-toolchain/platforms/supported/ubuntu12.platform
index c4a380af4944d96d229792c50ad8f959afefc983..6ebdc0e80d93294f4b4752bc9e66b07aba7cea10 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu12.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu12.platform
@@ -3,20 +3,13 @@
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
-# > sudo apt-get install build-essential automake autoconf gfortran \
-#        openmpi-bin openmpi-common libopenmpi-dev cmake subversion \
-#        git libblas-dev liblapack-dev libblas3gf liblapack3gf splint \
-#        tcl tcl-dev libsuitesparse-dev libtool libboost-all-dev qt4-dev-tools
+# > sudo apt-get install build-essential wget automake autoconf gfortran \
+#   openmpi-bin openmpi-common libopenmpi-dev cmake subversion \
+#   git libblas-dev liblapack-dev libblas3gf liblapack3gf \
+#   libsuitesparse-dev libtool libboost-all-dev \
+#   tcl tcl-dev splint qt4-dev-tools
 #
-# Then reboot.
-#
-# Afterwards, you should set your compilers safely:
-# > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77
-# and rerun candi again.
-#
-# To compile deal.II applications, you need to set the following variables
-# > export DEAL_II_DIR=${INSTALL_PATH} (see below for your settings)
-# > export PATH=$DEAL_II_DIR/bin:$PATH
+# Then run candi again.
 ##
 
 #

diff --git a/deal.II-toolchain/platforms/supported/ubuntu14.platform b/deal.II-toolchain/platforms/supported/ubuntu14.platform
index c09cc62ffaf1dcc0c663190c46ca506d166556d9..6c333756db4d062d147fd19e4ed91d2e6e7ba81b 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu14.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu14.platform
@@ -3,19 +3,15 @@
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
-# > sudo apt-get install build-essential automake autoconf gfortran \
+# > sudo apt-get install build-essential wget automake autoconf gfortran \
 #   openmpi-bin openmpi-common libopenmpi-dev cmake subversion \
-#   git libblas-dev liblapack-dev libblas3gf liblapack3gf splint \
-#   tcl tcl-dev environment-modules libsuitesparse-dev \
-#   libtool libboost-all-dev qt4-dev-tools
+#   git libblas-dev liblapack-dev libblas3gf liblapack3gf \
+#   libsuitesparse-dev libtool libboost-all-dev \
+#   splint tcl tcl-dev environment-modulesqt4-dev-tools
 #
-# Then reboot and run candi again.
+# Then run candi again.
 ##
 
-#
-# Define the additional packages for this platform.
-#PACKAGES="once:cmake ${PACKAGES}"
-
 # The default compiler on ubuntu14 does not support Trilinos 12
 # together with deal.II v8.3.0.
 # Note: this issue is resolved in the current development trunc

diff --git a/deal.II-toolchain/platforms/supported/ubuntu16.platform b/deal.II-toolchain/platforms/supported/ubuntu16.platform
index 56795e2cb6a305d83b945f05b489ddb029aaddd8..674cd2f3fef22f88afda6279016de2c8c3db2663 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu16.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu16.platform
@@ -3,15 +3,13 @@
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
-# > sudo apt-get install build-essential automake autoconf gfortran \
+# > sudo apt-get install build-essential lsb-release wget \
+#   automake autoconf gfortran \
 #   openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \
-#   libblas-dev liblapack-dev libblas3 liblapack3 splint tcl tcl-dev \
-#   environment-modules libsuitesparse-dev libtool libboost-all-dev \
-#   qt4-dev-tools
+#   libblas-dev liblapack-dev libblas3 liblapack3 \
+#   libsuitesparse-dev libtool libboost-all-dev \
+#   splint tcl tcl-dev environment-modules qt4-dev-tools
 #
-# Then reboot and run candi again.
+# Then run candi again.
 ##
 
-#
-# Define the additional packages for this platform.
-#PACKAGES="once:cmake ${PACKAGES}"