From fa7196ddec7cc05b89e0b7fb28d0990a187843d3 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Mon, 29 Dec 2014 09:04:47 +1300
Subject: [PATCH] OP-1654 fix linux rpath: removed hardcoded QMAKE_RPATHDIR

---
 ground/openpilotgcs/src/app/app.pro             | 4 ++--
 ground/openpilotgcs/src/openpilotgcslibrary.pri | 2 +-
 ground/openpilotgcs/src/openpilotgcsplugin.pri  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index 74e692644..598201b2b 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -30,8 +30,8 @@ win32 {
 } else {
     target.path  = /bin
     INSTALLS    += target
-    QMAKE_RPATHDIR = \'\$$ORIGIN\'/../$$GCS_LIBRARY_BASENAME/openpilotgcs
-    QMAKE_RPATHDIR += \'\$$ORIGIN\'/../$$GCS_LIBRARY_BASENAME/qt5
+    QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH)
+    QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH)
     include(../rpath.pri)
 }
 
diff --git a/ground/openpilotgcs/src/openpilotgcslibrary.pri b/ground/openpilotgcs/src/openpilotgcslibrary.pri
index 5c1651b81..59791944d 100644
--- a/ground/openpilotgcs/src/openpilotgcslibrary.pri
+++ b/ground/openpilotgcs/src/openpilotgcslibrary.pri
@@ -18,7 +18,7 @@ macx {
         target.files = $$DESTDIR/$${TARGET}.dll
     } else {
         QMAKE_RPATHDIR = \'\$$ORIGIN\'
-        QMAKE_RPATHDIR += \'\$$ORIGIN\'/../qt5
+        QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH)
         include(rpath.pri)
 
         target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs
diff --git a/ground/openpilotgcs/src/openpilotgcsplugin.pri b/ground/openpilotgcs/src/openpilotgcsplugin.pri
index 3752dd34b..0a9c8af6a 100644
--- a/ground/openpilotgcs/src/openpilotgcsplugin.pri
+++ b/ground/openpilotgcs/src/openpilotgcsplugin.pri
@@ -31,7 +31,7 @@ macx {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/
 } else:linux-* {
     QMAKE_RPATHDIR = \'\$$ORIGIN\'
-    QMAKE_RPATHDIR += \'\$$ORIGIN\'/../..
+    QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR)
     include(rpath.pri)
 }