Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
45b9bb83
Commit
45b9bb83
authored
Oct 20, 2012
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify patch: 001_add-main-makefile.full+lite.patch. Add uninstall routine.
parent
f801d405
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
2 deletions
+23
-2
changelog
debian/changelog
+2
-0
001_add-main-makefile.full+lite.patch
debian/patches/001_add-main-makefile.full+lite.patch
+21
-2
No files found.
debian/changelog
View file @
45b9bb83
...
...
@@ -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
...
...
debian/patches/001_add-main-makefile.full+lite.patch
View file @
45b9bb83
...
...
@@ -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,2
4
@@
@@ -0,0 +1,2
9
@@
+#!/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/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment