Fix broken rpath
authorJørgen Lind <jorgen.lind@nokia.com>
Thu, 23 Jun 2011 09:04:48 +0000 (11:04 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Thu, 23 Jun 2011 09:05:46 +0000 (11:05 +0200)
src/qt-compositor/qt-compositor.pri

index c1a3b89..7f5f5d4 100644 (file)
@@ -7,8 +7,11 @@ use_pkgconfig {
 
     #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}
+        WAYLAND_NEEDS_RPATH = $$system(pkg-config --libs-only-L wayland-server)
+        !isEmpty(WAYLAND_NEEDS_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