Makefile: fix up a9b145d4.

`readlink` returns nothing for non-symlinks. Careful investigation of the build environment revealed that libNX_X11.so.6.2 was no symlink to begin with - so the whole copy operation failed. Pro-actively fix the call though, in case we ever encounter a symlink there.

Makefile: fix up a9b145d4.
7b79e8d8 · Mihai Moldovan · c7e01938 · 7b79e8d8
Commit 7b79e8d8 authored Nov 05, 2016 by Mihai Moldovan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Makefile Makefile +2 -1

No files found.
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ INSTALL_FILE=install -m 644
 INSTALL_PROGRAM=install -m 755
 INSTALL_SYMLINK=ln -s -f
 COPY_SYMLINK=cp -a
+COPY_DEREFERENCED=cp -RH
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty

@@ -148,7 +149,7 @@ install-full:
 	$(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)
 	$(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so $(DESTDIR)$(USRLIBDIR)/
 	$(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/
-	cd nx-X11/.build-exports/lib/ && $(INSTALL_FILE) `readlink libNX_X11.so.6.2` $(DESTDIR)$(USRLIBDIR)/
+	$(COPY_DEREFERENCED) nx-X11/.build-exports/lib/libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/
 	$(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)/nx-X11
 	$(INSTALL_SYMLINK) ../libNX_X11.so $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so
 	$(INSTALL_SYMLINK) ../libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so.6.2