From 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 30 Jun 2016 23:50:12 +0200
Subject: Rework nxagent and nxproxy wrapper scripts.

  o Install nxagent/nxproxy executables into multi-arch path.
  o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*.
  o Allow injecting different $NXAPP containing the executable name.

  o For e.g. x2goagent this requires the following changes:

    - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to
      $LIBDIR/nx/bin/x2goagent
    - Replace /usr/bin/x2goagent by a two-liner...

    ```
    #!/bin/sh

    export NXAPP=x2goagent
    nxagent
    ```
---
 Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 47ac50fe9..470a46d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ BINDIR      ?= $(PREFIX)/bin
 LIBDIR      ?= $(PREFIX)/lib
 USRLIBDIR   ?= $(LIBDIR)
 INCLUDEDIR  ?= $(PREFIX)/include
-NXLIBDIR    ?= $(PREFIX)/lib/nx
+NXLIBDIR    ?= $(LIBDIR)/nx
 CONFIGURE   ?= ./configure
 
 NX_VERSION_MAJOR=$(shell ./version.sh 1)
@@ -36,6 +36,8 @@ SHELL:=/bin/bash
 	# clean auto-generated nxversion.def file \
 	if [ "x$@" == "xclean" ] || [ "x$@" = "xdistclean" ]; then \
 	    rm -f nx-X11/config/cf/nxversion.def; \
+	    rm -f bin/nxagent; \
+	    rm -f bin/nxproxy; \
 	fi
 
 all: build
@@ -91,6 +93,7 @@ install-lite:
 
 	# install nxproxy wrapper script
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxproxy.in > bin/nxproxy
 	$(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR)
 
 	# FIXME: the below install logic should work via nxproxy/Makefile.in
@@ -103,8 +106,11 @@ install-lite:
 	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
 
 install-full:
-	for f in nxagent; do \
-	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
+	# install nxagent wrapper script
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxagent.in > bin/nxagent
+	$(INSTALL_PROGRAM) bin/nxagent $(DESTDIR)$(BINDIR)
+
 	for d in nxcompext nxcompshad; do \
 	   $(MAKE) -C $$d install; done
 
@@ -141,6 +147,9 @@ install-full:
 
 	$(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)
 	$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(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
 
 	. replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | \
 	    while read dirname; do \
-- 
cgit v1.2.3