This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit e22c00d3ff082bcffd90085d94305e551d68198a Merge: 86b4532 f4619ea Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 29 22:38:54 2017 +0100 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug Makefile | 2 +- nx-X11/config/cf/Imake.rules | 3 ++- nx-X11/config/cf/gnuLib.rules | 12 ++++++++++-- nx-X11/config/cf/lnxLib.rules | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --cc nx-X11/config/cf/gnuLib.rules index 6d5818a,e9169bd..ea0df25 --- a/nx-X11/config/cf/gnuLib.rules +++ b/nx-X11/config/cf/gnuLib.rules @@@ -69,17 -69,17 +69,25 @@@ XCOMM XXX To rpath or not to rpath.. XCOMM XXX Maybe superfluous. #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) #else - #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR) + #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$$ORIGIN/$(BUILDLIBDIR) + #endif + #endif + #ifndef ExtraInstallLoadFlags + #ifdef UseInstalled + XCOMM XXX Maybe superfluous. + #define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) + #else + #define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$$ORIGIN/$(BUILDLIBDIR) #endif #endif +#ifndef ExtraInstallLoadFlags +#ifdef UseInstalled +XCOMM XXX Maybe superfluous. +#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) +#else +#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR) +#endif +#endif /* * InstallSharedLibrary - generate rules to install the shared library. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git