aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-07 10:45:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-07 10:45:58 +0100
commitb121300fde0496d06ce6bb9c58ae85a8e84cd09b (patch)
treefe0d4c748c4ef4aa71d311043cc23a75277149ad
parent39e84229d6b5c744513fff3f37cd4685ecb4f74b (diff)
downloadnx-libs-b121300fde0496d06ce6bb9c58ae85a8e84cd09b.tar.gz
nx-libs-b121300fde0496d06ce6bb9c58ae85a8e84cd09b.tar.bz2
nx-libs-b121300fde0496d06ce6bb9c58ae85a8e84cd09b.zip
Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard.
-rw-r--r--debian/Makefile.nx-libs2
-rw-r--r--debian/changelog3
2 files changed, 2 insertions, 3 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 5cfc96e21..93c7627f2 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -58,8 +58,6 @@ install-lite:
$(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
for d in nxcomp nxproxy; do \
$(MAKE) -C $$d install; done
- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
- $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
install-full:
for f in nxagent nxauth x2goagent; do \
diff --git a/debian/changelog b/debian/changelog
index 5fe3a881f..13b08e3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
- * Continue development...
+ * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan
+ Engelhard.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100