aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-22 23:35:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-22 23:35:40 +0100
commitf81df1a69982fb3c4cfe13248dec1b8bc3fb66af (patch)
tree0f1f66b5717accea4c52f7ea92a5be42f092970a /debian
parent8f151d797b015b7d1070151e75d56587a7f3652f (diff)
downloadnx-libs-f81df1a69982fb3c4cfe13248dec1b8bc3fb66af.tar.gz
nx-libs-f81df1a69982fb3c4cfe13248dec1b8bc3fb66af.tar.bz2
nx-libs-f81df1a69982fb3c4cfe13248dec1b8bc3fb66af.zip
Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR) into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143).
Diffstat (limited to 'debian')
-rw-r--r--debian/Makefile.nx-libs2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index beb522c5b..bb490735b 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -66,7 +66,7 @@ install-full:
$(MAKE) -C $$d install; done
$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
- cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent
+ cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(DESTDIR)$(NXLIBDIR)/bin/nxagent x2goagent
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
diff --git a/debian/changelog b/debian/changelog
index 824d74608..bd680a105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
* Work-in patch from Jan Engehardt for working around different
improper bash implementations of string-in-string replacing. (Fixes:
#145).
+ * Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR)
+ into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143).
[ Orion Poplawski ]
* Fix wrong symlink direction of libNX_* files. (Fixes: #107).