diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-16 05:45:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-16 06:28:47 +0100 |
| commit | 892c08ddc4f4f7fc84b22081a53e4385a737ab23 (patch) | |
| tree | 3219762d8918987cfe73a59c68bba98e3e4b480d | |
| parent | f29cc29fd37731c09c04e615da4ee345bbc92733 (diff) | |
| download | nx-libs-892c08ddc4f4f7fc84b22081a53e4385a737ab23.tar.gz nx-libs-892c08ddc4f4f7fc84b22081a53e4385a737ab23.tar.bz2 nx-libs-892c08ddc4f4f7fc84b22081a53e4385a737ab23.zip | |
Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in.
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 12 insertions, 5 deletions
@@ -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 bd10412ed..ad42842bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,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 |