diff options
author | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
commit | 3c81899718e3429e45381beaaba58d4886a5537c (patch) | |
tree | 509b9d44cc872ba45df0b3c2afc74e90ca0cc6e4 /nxcompshad | |
parent | e13e31f752c0b204f964ee1df272a6b31ce51189 (diff) | |
parent | 1c1431c0ff41afa8221ea8a1e0d4514746ebbaa3 (diff) | |
download | nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.gz nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.bz2 nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.zip |
Merge branch 'Ionic-bugfix/rpath' into 3.6.x
Attributes GH PR #614: https://github.com/ArcticaProject/nx-libs/pull/614
Fixes: ArcticaProject/nx-libs#610
Diffstat (limited to 'nxcompshad')
-rw-r--r-- | nxcompshad/src/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am index 33f3abdb9..f7beac86e 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,11 @@ 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 \ + -Wl,--enable-new-dtags \ + -R '$(libdir)/nx/X11' \ + $(NULL) libXcompshadincludedir = $(includedir)/nx libXcompshadinclude_HEADERS = \ |