diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-12 09:59:57 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-12 10:01:18 +0100 |
| commit | d569145e640c40ea4cccbdd8703a254618b10c73 (patch) | |
| tree | 2c1682660b50e709fb62bdb264b2aa268eb61274 | |
| parent | a7cc4edef158a1d7c02eb074baf74b7bd3cb0fec (diff) | |
| download | nx-libs-d569145e640c40ea4cccbdd8703a254618b10c73.tar.gz nx-libs-d569145e640c40ea4cccbdd8703a254618b10c73.tar.bz2 nx-libs-d569145e640c40ea4cccbdd8703a254618b10c73.zip | |
Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script.
| -rw-r--r-- | debian/Makefile.nx-libs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index e85f40447..3aeda739b 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -60,10 +60,12 @@ install: install-lite: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for f in nxproxy; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done + mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/ + mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/ + for f in nxproxy; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ diff --git a/debian/changelog b/debian/changelog index 00523babe..515186119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Makefile.nx-libs: Don't allow symlinks to point into buildroot. * Makefile.nx-libs: Install man pages via main Makefile. * Add Description: and Author: fields to various patch headers. + * Makefile.nx-libs: Run make install for nxproxy first, then create the + wrapper script. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in |