aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-29 08:04:44 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-29 08:04:44 +0200
commit7a6b40a11ded7f36e8d99039144238d33a84849d (patch)
treec249be2aba09a8f85703421df4c0bff5e82ec984 /Makefile
parent7b7ba9441b3ff72f0e963221342dcccbafc04312 (diff)
parent83983e944e5076ad2d8beb6dd9190559fb6c5937 (diff)
downloadnx-libs-7a6b40a11ded7f36e8d99039144238d33a84849d.tar.gz
nx-libs-7a6b40a11ded7f36e8d99039144238d33a84849d.tar.bz2
nx-libs-7a6b40a11ded7f36e8d99039144238d33a84849d.zip
Merge pull request #19 from ArcticaProject/PR-ionic/libXinerama_symlink_to_libnx-xinerama1
debian/libnx-xinerama1.*: also create libXinerama symlink in libnx-xinerama1.postinst (and remove in libxinerama1.prerm).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9f6442181..47efbde52 100644
--- a/Makefile
+++ b/Makefile
@@ -155,11 +155,12 @@ install-full:
done; \
# Provide means for Xinerama support in NX/X2Go sessions. This
- # This also requires two post-install symlinks:
- # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
- # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
- $(INSTALL_SYMLINK) $(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
+ # This also requires three post-install symlinks created by libnx-xinerama1:
+ # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
+ # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
+ # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1
+ # Only create the owned directory here for nx-x11-common.
+ $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX)
$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)