[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.16-2-g5a640ef

[X2Go dev team]

The branch, build-main has been updated
       via  5a640efd1002d5fadff72542afb8e00bd14bcb6e (commit)
      from  9e8a2792f5c378345248d781877940a30684c759 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    3 ++-
 .../patches/001_add-main-makefile.full+lite.patch  |   20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cb7dc66..0fb9570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  [ Jan Engelhardt ]
+  * Fix /bin/Makefile. Add $(DESTDIR) to every install path.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Nov 2012 21:14:23 +0100
 
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 1376d44..6bbf70b 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -59,7 +59,7 @@ Last-Update: 2011-12-31
 +	fi
 --- /dev/null
 +++ b/bin/Makefile
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,31 @@
 +#!/usr/bin/make -f
 +
 +INSTALL_DIR=install -d -o root -g root -m 755
@@ -79,13 +79,15 @@ Last-Update: 2011-12-31
 +	echo "Nothing to do for $@..."
 +
 +install:
-+	$(INSTALL_DIR) $(X2GOLIBDIR)/bin/
-+	ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent
-+	find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
-+	find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
++	mkdir -p $(DESTDIR)$(X2GOLIBDIR)/bin
++	$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
++	ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
++	mkdir -p $(DESTDIR)$(BINDIR)
++	find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done
++	find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done
 +
 +uninstall:
-+	find nx* | while read file; do rm -f $(BINDIR)/$$file; done
-+	find x2go* | while read file; do rm -f $(BINDIR)/$$file; done
-+	$(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent
-+	$(RM_DIR) $(X2GOLIBDIR)/bin/
++	find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done
++	find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done
++	$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
++	$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).