[X2Go-Commits] [nx-libs] 03/03: Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script.

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit d569145e640c40ea4cccbdd8703a254618b10c73
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 12 09:59:57 2015 +0100

    Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script.
---
 debian/Makefile.nx-libs |    6 ++++--
 debian/changelog        |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index e85f404..3aeda73 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -60,10 +60,12 @@ install:
 
 install-lite:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	for f in nxproxy; do \
-	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
 	for d in nxcomp nxproxy; do \
 	   $(MAKE) -C $$d install; done
+	mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/
+	mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/
+	for f in nxproxy; do \
+	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
diff --git a/debian/changelog b/debian/changelog
index 00523ba..5151861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
   * Makefile.nx-libs: Don't allow symlinks to point into buildroot.
   * Makefile.nx-libs: Install man pages via main Makefile.
   * Add Description: and Author: fields to various patch headers.
+  * Makefile.nx-libs: Run make install for nxproxy first, then create the
+    wrapper script.
 
   * NX code reduction efforts (from 93Mb to 41Mb):
     - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git