aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-26 04:10:27 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-30 03:36:11 +0100
commitb13bf675acbd384cffdcb0ecb6430a5d7b4a19e0 (patch)
treedfbedf42b3cc06dae7dcc3f9f94968c792ec6df5
parent26ab7b8a79e6c901518d9136d00b79e2905dab58 (diff)
downloadnx-libs-b13bf675acbd384cffdcb0ecb6430a5d7b4a19e0.tar.gz
nx-libs-b13bf675acbd384cffdcb0ecb6430a5d7b4a19e0.tar.bz2
nx-libs-b13bf675acbd384cffdcb0ecb6430a5d7b4a19e0.zip
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
-rw-r--r--nxcompshad/src/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am
index 33f3abdb9..670bc4d1e 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 = \