[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/admin
From:       David Faure <faure () kde ! org>
Date:       2005-01-08 16:16:09
Message-ID: 20050108161609.9121A1BC1D () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Fix wrong RPATH when installing a module into its own prefix.


  M +5 -1      acinclude.m4.in   2.495


--- kde-common/admin/acinclude.m4.in  #2.494:2.495
@@ -3301,5 +3301,9 @@
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-R \$(kde_libraries)"
+  KDE_RPATH="-R \$(libdir)"
+
+  if test "$kde_libraries" != "$libdir"; then
+      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
+  fi
 
   if test -n "$qt_libraries"; then


[prev in list] [next in list] [prev in thread] [next in thread]