aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2016-11-05 05:20:31 +0000
committerMihai Moldovan <ïonic@ionic.de>2016-11-05 05:25:18 +0000
commit7b79e8d831a520624fd5e28be6da7c6ad3360c1a (patch)
tree98d64d55d893b495e82ac29e632a0924f499c366
parentc7e01938d80ec0ef94e59877a6f1d49545d6fef4 (diff)
downloadnx-libs-7b79e8d831a520624fd5e28be6da7c6ad3360c1a.tar.gz
nx-libs-7b79e8d831a520624fd5e28be6da7c6ad3360c1a.tar.bz2
nx-libs-7b79e8d831a520624fd5e28be6da7c6ad3360c1a.zip
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.
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
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