diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 22:56:14 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 22:56:14 +0200 |
| commit | 45b9bb839f6fc6e3022a9d4fed88aae8e23b497a (patch) | |
| tree | 5a6b2ea0635b372dc1576101310e640aad933b01 | |
| parent | f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b (diff) | |
| download | nx-libs-45b9bb839f6fc6e3022a9d4fed88aae8e23b497a.tar.gz nx-libs-45b9bb839f6fc6e3022a9d4fed88aae8e23b497a.tar.bz2 nx-libs-45b9bb839f6fc6e3022a9d4fed88aae8e23b497a.zip | |
Modify patch: 001_add-main-makefile.full+lite.patch. Add uninstall routine.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/001_add-main-makefile.full+lite.patch | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1ed80c2dc..b36c27341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low x2goagent wrapper scripts during make install. * Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method. + * Modify patch: 001_add-main-makefile.full+lite.patch. Add uninstall + routine. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Sep 2012 10:06:54 +0200 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 4910982c4..1376d44f3 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,9 +5,10 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,37 @@ +@@ -0,0 +1,51 @@ +#!/usr/bin/make -f + ++PREFIX ?= /usr/local +CONFIGURE=./configure + +%: @@ -43,15 +44,31 @@ Last-Update: 2011-12-31 + else \ + ${MAKE} build-full; \ + fi ++ ++uninstall: ++ if test -f bin/Makefile; then ${MAKE} -C bin $@; fi ++ 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; \ ++ if test -f nx-X11/Makefile; then \ ++ if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \ ++ if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \ ++ fi; \ ++ fi --- /dev/null +++ b/bin/Makefile -@@ -0,0 +1,24 @@ +@@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + ++RM_FILE=rm -f ++RM_DIR=rmdir -p --ignore-fail-on-non-empty ++ +DESTDIR= +PREFIX ?= /usr/local +BINDIR=$(PREFIX)/bin @@ -70,3 +87,5 @@ Last-Update: 2011-12-31 +uninstall: + find nx* | while read file; do rm -f $(BINDIR)/$$file; done + find x2go* | while read file; do rm -f $(BINDIR)/$$file; done ++ $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent ++ $(RM_DIR) $(X2GOLIBDIR)/bin/ |