aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-16 05:51:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-16 06:09:24 +0100
commitffb64d2b0794af8aa59751b0d757110325b74e55 (patch)
tree903978c6e611cba08ecc650c03adc4d3adbf52f2 /debian
parentd2ff2138b4710faab79145e8ac020d295754a8d6 (diff)
downloadnx-libs-ffb64d2b0794af8aa59751b0d757110325b74e55.tar.gz
nx-libs-ffb64d2b0794af8aa59751b0d757110325b74e55.tar.bz2
nx-libs-ffb64d2b0794af8aa59751b0d757110325b74e55.zip
Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full.
Diffstat (limited to 'debian')
-rw-r--r--debian/Makefile.nx-libs14
-rw-r--r--debian/changelog2
2 files changed, 11 insertions, 5 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 2c2cf3548..f0c8a978b 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -164,8 +164,15 @@ uninstall:
[ ! -d nx-X11 ] || $(MAKE) uninstall-full
uninstall-lite:
- for f in nxproxy; do \
- $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done
+ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
+
+ # uninstall nproxy wrapper script
+ $(RM_FILE) $(DESTDIR)$(BINDIR)/nxproxy
+ # FIXME: don't use uninstall rule in nxproxy/Makefile.in, let's do
+ # it on our own for now...
+ $(RM_FILE) $(DESTDIR)$(NXLIBDIR)/bin/nxproxy
+ $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+ $(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1
uninstall-full:
for f in nxagent nxauth x2goagent; do \
@@ -174,9 +181,6 @@ uninstall-full:
$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
- if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
- if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
-
if test -d nx-X11; then \
if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
diff --git a/debian/changelog b/debian/changelog
index da26c9b0e..16978ec7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
wrapper script.
* Make install-lite rule in Makefile.nx-libs more predictable and not
rely on nxproxy/Makefile.in.
+ * Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp
+ uninstallation has to be in uninstall-lite, not in uninstall-full.
* NX code reduction efforts (from 93Mb to 41Mb):
- Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in