From 5a640efd1002d5fadff72542afb8e00bd14bcb6e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 12 Nov 2012 08:45:46 +0100
Subject: Fix /bin/Makefile. Add $(DESTDIR) to every install path.

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

diff --git a/debian/changelog b/debian/changelog
index cb7dc6601..0fb957098 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@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 1376d44f3..6bbf70bca 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/
-- 
cgit v1.2.3