From 469d1adf6844c048adfc75525b344c3cb1d9d3de Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B8rgen=20Lind?= Date: Thu, 23 Jun 2011 11:04:48 +0200 Subject: [PATCH] Fix broken rpath --- src/qt-compositor/qt-compositor.pri | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri index c1a3b89..7f5f5d4 100644 --- a/src/qt-compositor/qt-compositor.pri +++ b/src/qt-compositor/qt-compositor.pri @@ -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 -- 2.7.4