From 7b79e8d831a520624fd5e28be6da7c6ad3360c1a Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ïonic@ionic.de>
Date: Sat, 5 Nov 2016 05:20:31 +0000
Subject: 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 11f8a7d9b..0684ffbed 100644
--- 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
-- 
cgit v1.2.3