From 892c08ddc4f4f7fc84b22081a53e4385a737ab23 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 16 Feb 2015 05:45:17 +0100
Subject: Make install-lite rule in Makefile.nx-libs more predictable and not
 rely on nxproxy/Makefile.in.

---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 52326fb22..2c2cf3548 100644
--- a/Makefile
+++ b/Makefile
@@ -59,17 +59,22 @@ install:
 	[ ! -d nx-X11 ] || $(MAKE) install-full
 
 install-lite:
+	# install nxcomp library
+	$(MAKE) -C nxcomp install
+
+	# install nxproxy wrapper script
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	for d in nxcomp nxproxy; do \
-	   $(MAKE) -C $$d install; done
-	for f in nxproxy; do \
-	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
+	$(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR)
+
+	# FIXME: the below install logic should work via nxproxy/Makefile.in
+	# overriding for now...
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
 
-
 install-full:
 	for f in nxagent nxauth x2goagent; do \
 	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
-- 
cgit v1.2.3