[X2Go-Commits] [nx-libs] 02/12: nxcompshad/src/Makefile.am: implement libX11 RPATH/RUNPATH override.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 3 03:25:54 CET 2018
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 b13bf675acbd384cffdcb0ecb6430a5d7b4a19e0
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Dec 26 04:10:27 2017 +0100
nxcompshad/src/Makefile.am: implement libX11 RPATH/RUNPATH override.
Same method as used in the previous commit, but easier done thanks to
autotools and libtool.
Fixes: ArcticaProject/nx-libs#610
---
nxcompshad/src/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am
index 33f3abd..670bc4d 100644
--- a/nxcompshad/src/Makefile.am
+++ b/nxcompshad/src/Makefile.am
@@ -13,6 +13,7 @@ libXcompshad_la_SOURCES = \
$(NULL)
libXcompshad_la_LIBADD = \
+ -lX11 \
@Xext_LIBS@ \
@Xdamage_LIBS@ \
@Xrandr_LIBS@ \
@@ -36,7 +37,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/../nx-X11/exports/include \
$(NULL)
-libXcompshad_la_LDFLAGS = -version-number @LT_COMPSHAD_VERSION@ -no-undefined
+libXcompshad_la_LDFLAGS = \
+ -version-number @LT_COMPSHAD_VERSION@ -no-undefined \
+ -R '$(libdir)/nx/X11' \
+ $(NULL)
libXcompshadincludedir = $(includedir)/nx
libXcompshadinclude_HEADERS = \
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list