[X2Go-Commits] [x2goserver] 03/07: x2goserver-x2goagent/Makefile: replace ${PREFIX}/bin/x2goagent wrapper script with a symlink to the ... x2goagent symlink in the NXLIBDIR.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 035000a53f84844b32f6a29599210458b947a903
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 20 23:49:13 2018 +0100

    x2goserver-x2goagent/Makefile: replace ${PREFIX}/bin/x2goagent wrapper script with a symlink to the ... x2goagent symlink in the NXLIBDIR.
---
 debian/changelog              | 2 ++
 x2goserver-x2goagent/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe3db4a..c52885a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       share/mime/packages/sshfs-x2go.xml as a plain file, not an executable.
     - x2goserver-x2goagent/share/x2go/x2gofeature.d/x2goserver-x2goagent*:
       make executable.
+    - x2goserver-x2goagent/Makefile: replace ${PREFIX}/bin/x2goagent wrapper
+      script with a symlink to the ... x2goagent symlink in the NXLIBDIR.
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile
index 810c9b0..e66efc7 100755
--- a/x2goserver-x2goagent/Makefile
+++ b/x2goserver-x2goagent/Makefile
@@ -20,7 +20,7 @@ NXLIBDIR ?= $(LIBDIR)/../nx
 MANDIR=$(PREFIX)/share/man
 SHAREDIR=$(PREFIX)/share/x2go
 
-BIN_SCRIPTS=$(shell cd bin && echo *)
+BIN_SCRIPTS=x2goagent $(shell cd bin && echo *)
 FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features)
 
 man_pages = `cd man && find * -type f`
@@ -53,7 +53,7 @@ install: install_scripts install_config install_data install_man install_version
 
 install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL_PROGRAM) bin/x2goagent $(DESTDIR)$(BINDIR)/
+	$(INSTALL_SYMLINK) ../../$(NX_LIBDIR)/x2goagent $(DESTDIR)$(BINDIR)/x2goagent
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git