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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -176,7 +176,7 @@ install-full: $(MAKE) -C nxcompshad install $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/bin - $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent-relink $(DESTDIR)$(BINDIR)/nxagent $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps @@ -201,7 +201,7 @@ install-full: cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include # copy libs (for libnx-x11), we want the targets of the links - . replace.sh; set -x; find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ + . replace.sh; set -x; find nx-X11/exports/lib/ -name "libNX*.so" | while read libpath; do \ libfile=$$(basename $$libpath); \ libdir=$$(dirname $$libpath); \ link=$$(readlink $$libpath); \ |