aboutsummaryrefslogtreecommitdiff
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:28:47 +0100
commitdb12538ddeb32db3bfd1882d2bb34ff00809301e (patch)
tree62e32112ccd9fd6abafbe8892917303f5692295b
parent892c08ddc4f4f7fc84b22081a53e4385a737ab23 (diff)
downloadnx-libs-db12538ddeb32db3bfd1882d2bb34ff00809301e.tar.gz
nx-libs-db12538ddeb32db3bfd1882d2bb34ff00809301e.tar.bz2
nx-libs-db12538ddeb32db3bfd1882d2bb34ff00809301e.zip
Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full.
-rw-r--r--Makefile14
-rw-r--r--debian/changelog2
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2c2cf3548..f0c8a978b 100644
--- a/Makefile
+++ b/Makefile
@@ -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 ad42842bf..476fadac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,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