From 6f92ca843e6d1c4f8ef2be5ceba361cd74b79250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 4 Jan 2016 01:37:46 +0100
Subject: GH-1389 remove use of LD_LIBRARY_PATH for mmc libs

---
 application/CMakeLists.txt        | 5 +++++
 application/package/linux/MultiMC | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 65bee8c9..75f7d78e 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -71,6 +71,11 @@ endif()
 # directories to look for dependencies
 set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
+# Install RPATH - let's not use LD_LIBRARY_PATH
+if(UNIX AND NOT APPLE)
+	set(CMAKE_INSTALL_RPATH "\\\$ORIGIN")
+endif()
+
 ################################ FILES ################################
 
 ######## Sources and headers ########
diff --git a/application/package/linux/MultiMC b/application/package/linux/MultiMC
index 9e1d7720..e807d4a4 100755
--- a/application/package/linux/MultiMC
+++ b/application/package/linux/MultiMC
@@ -20,7 +20,7 @@ echo "MultiMC Dir: ${MMC_DIR}"
 # Set up env - filter out input LD_ variables but pass them in under different names
 export GAME_LIBRARY_PATH=${GAME_LIBRARY_PATH-${LD_LIBRARY_PATH}}
 export GAME_PRELOAD=${GAME_PRELOAD-${LD_PRELOAD}}
-export LD_LIBRARY_PATH="${MMC_DIR}/bin":$MMC_LIBRARY_PATH
+export LD_LIBRARY_PATH=$MMC_LIBRARY_PATH
 export LD_PRELOAD=$MMC_PRELOAD
 export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
 export QT_FONTPATH="${MMC_DIR}/fonts"
-- 
cgit v1.2.3