[X2Go-Commits] [nx-libs] 03/05: Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in.
git-admin at x2go.org
git-admin at x2go.org
Mon Feb 16 06:26:42 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.
commit d2ff2138b4710faab79145e8ac020d295754a8d6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 16 05:45:17 2015 +0100
Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in.
---
debian/Makefile.nx-libs | 15 ++++++++++-----
debian/changelog | 2 ++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 52326fb..2c2cf35 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -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
diff --git a/debian/changelog b/debian/changelog
index 304a7f8..da26c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
* Add Description: and Author: fields to various patch headers.
* Makefile.nx-libs: Run make install for nxproxy first, then create the
wrapper script.
+ * Make install-lite rule in Makefile.nx-libs more predictable and not
+ rely on nxproxy/Makefile.in.
* 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
More information about the x2go-commits
mailing list