Author: Pino Toscano <pino@debian.org>
Description: Enable RPATH also on kFreeBSD and Hurd
 qtcreator's plugins use RPATH to locate the qtcreator libraries, so enable it
 also on kFreeBSD and Hurd.
Last-Update: 2012-05-19
Forwarded: no

---
 src/qtcreatorplugin.pri                         |    4 ++--
 src/rpath.pri                                   |    2 +-
 src/tools/qtcreatorwidgets/qtcreatorwidgets.pro |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

--- a/src/rpath.pri
+++ b/src/rpath.pri
@@ -5,7 +5,7 @@ macx {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
         QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
     }
-} else:linux-* {
+} else:linux-*|glibc-*|hurd-* {
     #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
     # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
     QMAKE_RPATHDIR += \$\$ORIGIN
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -64,7 +64,7 @@ macx {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/
         QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
     }
-} else:linux-* {
+} else:linux-*|glibc-*|hurd-* {
     #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
     QMAKE_RPATHDIR += \$\$ORIGIN
     QMAKE_RPATHDIR += \$\$ORIGIN/..
@@ -78,7 +78,7 @@ macx {
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 CONFIG += plugin plugin_with_soname
-linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
 !macx {
     target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {
     IDE_LIBRARY_BASENAME = lib
 }
 
-linux-*||win32 {
+linux-*||win32||glibc-*||hurd-* {
   # form abs path to qtcreator lib dir
   QTC_LIBS=$$dirname(OUT_PWD)
   QTC_LIBS=$$dirname(QTC_LIBS)
@@ -21,7 +21,7 @@ linux-*||win32 {
   QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
 }
 
-linux-*{  
+linux-*|glibc-*|hurd-*{  
   QMAKE_RPATHDIR *= $$QTC_LIBS
 }