Skip to content

Commit

Permalink
Merge branch 'pr/makefile_replace_sh' into 3.6.x
Browse files Browse the repository at this point in the history
Attributes GH PR #1076: #1076
  • Loading branch information
sunweaver committed Jun 30, 2024
2 parents 314ec41 + a64936a commit beeceb7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand All @@ -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 \
Expand Down

0 comments on commit beeceb7

Please sign in to comment.