diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 17:58:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 17:58:04 +0200 |
| commit | d39771037bea6109cc7ce2e41c9f0d3271f536a3 (patch) | |
| tree | fbd8d7a2e54ed26b814c8bc2fdc614f664112028 | |
| parent | 30d311a6874f3d23e0ee9334d2160e8af724108c (diff) | |
| download | nx-libs-d39771037bea6109cc7ce2e41c9f0d3271f536a3.tar.gz nx-libs-d39771037bea6109cc7ce2e41c9f0d3271f536a3.tar.bz2 nx-libs-d39771037bea6109cc7ce2e41c9f0d3271f536a3.zip | |
Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent wrapper scripts during make install.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/001_add-main-makefile.full+lite.patch | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 06b5efa59..9666d6e1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low make build has run. * Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove unneeded build file from NoMachine's nxproxy sources. + * Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and + x2goagent wrapper scripts during make install. -- 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 fffa4dc42..5c13e630b 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,12 +5,13 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,36 @@ +@@ -0,0 +1,37 @@ +#!/usr/bin/make -f + +CONFIGURE=./configure + +%: ++ 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 \ @@ -42,3 +43,21 @@ Last-Update: 2011-12-31 + else \ + ${MAKE} build-full; \ + fi +--- /dev/null ++++ b/bin/Makefile +@@ -0,0 +1,15 @@ ++#!/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 ++ ++DESTDIR= ++PREFIX ?= /usr/local ++BINDIR=$(PREFIX)/bin ++ ++%: ++ ++install: ++ find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done ++ find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done |