Commit 892c08dd authored by Mike Gabriel's avatar Mike Gabriel

Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in.

parent f29cc29f
...@@ -59,17 +59,22 @@ install: ...@@ -59,17 +59,22 @@ install:
[ ! -d nx-X11 ] || $(MAKE) install-full [ ! -d nx-X11 ] || $(MAKE) install-full
install-lite: install-lite:
# install nxcomp library
$(MAKE) -C nxcomp install
# install nxproxy wrapper script
$(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
for d in nxcomp nxproxy; do \ $(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR)
$(MAKE) -C $$d install; done
for f in nxproxy; do \ # FIXME: the below install logic should work via nxproxy/Makefile.in
$(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done # overriding for now...
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
$(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
install-full: install-full:
for f in nxagent nxauth x2goagent; do \ for f in nxagent nxauth x2goagent; do \
$(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
......
...@@ -34,6 +34,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium ...@@ -34,6 +34,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
* Add Description: and Author: fields to various patch headers. * Add Description: and Author: fields to various patch headers.
* Makefile.nx-libs: Run make install for nxproxy first, then create the * Makefile.nx-libs: Run make install for nxproxy first, then create the
wrapper script. 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): * NX code reduction efforts (from 93Mb to 41Mb):
- Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment