Use relative rpath to support relocatable binary packages

Change-Id: I7ec8707acf021b0f168691014fb0ba2f68ae29a6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd13be06febf400a4929362782800e0356eca8b8..f4f627ae1d7fc625de40e1f2d1d78d10ae21bef5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -990,11 +990,10 @@ else()
     set(GMX_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
 endif()
 
-if ( DEFINED GMXLIB )
-    set(LIB_INSTALL_DIR "${GMX_INSTALL_PREFIX}${GMXLIB}")
-else()
-    set(LIB_INSTALL_DIR  ${GMX_INSTALL_PREFIX}lib)
+if ( NOT DEFINED GMXLIB )
+    set(GMXLIB lib)
 endif()
+set(LIB_INSTALL_DIR "${GMX_INSTALL_PREFIX}${GMXLIB}")
 set(BIN_INSTALL_DIR  ${GMX_INSTALL_PREFIX}bin)
 set(DATA_INSTALL_DIR ${GMX_INSTALL_PREFIX}share/gromacs)
 set(MAN_INSTALL_DIR  ${GMX_INSTALL_PREFIX}share/man)
@@ -1008,7 +1007,7 @@ set(GMXLIBDIR        ${DATA_INSTALL_DIR}/top)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(CMAKE_SKIP_BUILD_RPATH  FALSE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-    set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+    set(CMAKE_INSTALL_RPATH "\\\$ORIGIN/../${GMXLIB}")
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()