diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 15:41:33 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 15:41:33 +0200 |
| commit | beeceb7e7c3e209c6041ed9b51c597e12523fae5 (patch) | |
| tree | 0f4f0801d9f81bb366c3d3447edb0ec40f776624 | |
| parent | 314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c (diff) | |
| parent | a64936a63283edb811f8e373a32f2d07d05f5172 (diff) | |
| download | nx-libs-beeceb7e7c3e209c6041ed9b51c597e12523fae5.tar.gz nx-libs-beeceb7e7c3e209c6041ed9b51c597e12523fae5.tar.bz2 nx-libs-beeceb7e7c3e209c6041ed9b51c597e12523fae5.zip | |
Merge branch 'pr/makefile_replace_sh' into 3.6.x
Attributes GH PR #1076: https://github.com/ArcticaProject/nx-libs/pull/1076
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -261,7 +261,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/ -name "libNX*.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); \ @@ -275,7 +275,7 @@ install-full: $(INSTALL_SYMLINK) ../../libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/libX11.so.6 $(INSTALL_SYMLINK) ../../libNX_X11.so.6.3.0 $(DESTDIR)$(USRLIBDIR)/libX11.so.6.3.0 - . replace.sh; set -x; find nx-X11/.build-exports/include/{nx*,GL} -type d | \ + . ./replace.sh; set -x; find nx-X11/.build-exports/include/{nx*,GL} -type d | \ while read dirname; do \ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"; \ $(INSTALL_FILE) $${dirname}/*.h \ |