Merge "Merge branch origin/release-5-0"

diff --combined docs/install-guide/index.rst
index ab66e6170757706cac02f50573f74d08174cf7d0,f8e4f51646a68bf8a33c804dc9562a8438288b13..3eb21f5afa0dc39d27b79eb4f86515964836db25
--- 1/docs/install-guide/index.rst
--- 2/docs/install-guide/index.rst
+++ b/docs/install-guide/index.rst
@@@ -379,8 -379,9 +379,8 @@@ configuration, in particular if you nee
  
  A key thing to consider here is the setting of
  ``CMAKE_INSTALL_PREFIX``. You will need to be able to write to this
 -directory in order to install |Gromacs| later, and if you change your
 -mind later, changing it in the cache triggers a full re-build,
 -unfortunately. So if you do not have super-user privileges on your
 +directory in order to install |Gromacs| later.
 +So if you do not have super-user privileges on your
  machine, then you will need to choose a sensible location within your
  home directory for your |Gromacs| installation. Even if you do have
  super-user privileges, you should use them only for the installation
@@@ -587,6 -588,13 +587,13 @@@ simulation using MPI libraries (e.g. Bl
    where that is the default. To use static system libraries,
    additional compiler/linker flags are necessary, e.g. ``-static-libgcc
    -static-libstdc++``.
+ * To attempt to link a fully static binary set
+   ``-DGMX_BUILD_SHARED_EXE=OFF``. This will prevent CMake from explicitly
+   setting any dynamic linking flags. This option also sets
+   ``-DBUILD_SHARED_LIBS=OFF`` and ``-DGMX_PREFER_STATIC_LIBS=ON`` by
+   default, but the above caveats apply. For compilers which don't
+   default to static linking, the required flags have to be specified. On
+   Linux, this is usually ``CFLAGS=-static CXXFLAGS=-static``.
  
  Portability aspects
  ^^^^^^^^^^^^^^^^^^^
@@@ -949,13 -957,10 +956,10 @@@ Building on Cra
  ----------------
  |Gromacs| builds mostly out of the box on modern Cray machines, but
  
- * you may need to specify the use of static or dynamic libraries
-   (depending on the machine) with ``-DBUILD_SHARED_LIBS=off``,
+ * you may need to specify the use of static binaries
+   with ``-DGMX_BUILD_SHARED_EXE=off``,
  * you may need to set the F77 environmental variable to ``ftn`` when
    compiling FFTW,
- * you may need to use ``-DCMAKE_SKIP_RPATH=YES``, and
- * you may need to modify the CMakeLists.txt files to specify the
-   ``BUILD_SEARCH_END_STATIC`` target property.
  
  Building on BlueGene
  --------------------