Install libraries in correct directories on multiarch systems.

NB: this patch may change the default install dirs on some systems,
and will _not_ overwrite previous installations. Thus make sure to
link to the correct library versions of e.g. libgromacs.

Fixes #591 and #623.

Change-Id: Ibd1d7d216236a0f5841ba9f0ac622a3f8f1a8718

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c06b6248310c1ef632d554f6685ec2c0aa93d2f2..27e23ff1c41d6a23333de8ec461bb01e363450e8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,8 +780,11 @@ set(PKG_CFLAGS "${PKG_CFLAGS} ${OpenMP_C_FLAGS}")
 ########################################################################
 # Specify install locations
 ########################################################################
-set(GMX_LIB_INSTALL_DIR lib CACHE STRING
-    "Library installation directory (default: lib)")
+# Use GNUInstallDirst to set paths on multiarch systems
+include(GNUInstallDirs)
+
+set(GMX_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING
+    "Library installation directory (default: ${CMAKE_INSTALL_LIBDIR})")
 set(GMX_DATA_INSTALL_DIR gromacs CACHE STRING
     "Data installation directory under share/ (default: gromacs)")
 mark_as_advanced(GMX_LIB_INSTALL_DIR GMX_DATA_INSTALL_DIR)