From 62b389ede0163226ee02e15716fa496c232148fc Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 6 Apr 2011 12:53:58 +0200
Subject: [PATCH] Set the rpath
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Wayland is currently instaled in non-standard dirs, so set the rpath if
the system supports rpath.

Reviewed-By: Jørgen Lind
---
 src/qt-compositor/qt-compositor.pri | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index c29b7b0..6100bbd 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -4,6 +4,12 @@ use_pkgconfig {
     #for some reason this is not included in the cflags line
     INCLUDEPATH += $$system(pkg-config --variable=includedir wayland-server)
     LIBS += $$system(pkg-config --libs wayland-server)
+
+    #set the rpath
+    !isEmpty(QMAKE_LFLAGS_RPATH) {
+        WAYLAND_LIBDIR = $$system(pkg-config --variable=libdir wayland-server)
+        !isEmpty(WAYLAND_LIBDIR):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${WAYLAND_LIBDIR}
+    }
 } else {
     INCLUDEPATH += $$PWD/../3rdparty/wayland
     LIBS += -L$$PWD/../../lib
-- 
2.7.4