Commit d3977103 authored by Mike Gabriel's avatar Mike Gabriel

Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent…

Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent wrapper scripts during make install.
parent 30d311a6
...@@ -11,6 +11,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low ...@@ -11,6 +11,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low
make build has run. make build has run.
* Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove * Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove
unneeded build file from NoMachine's nxproxy sources. 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 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Sep 2012 10:06:54 +0200
......
...@@ -5,12 +5,13 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> ...@@ -5,12 +5,13 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2011-12-31 Last-Update: 2011-12-31
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1,36 @@ @@ -0,0 +1,37 @@
+#!/usr/bin/make -f +#!/usr/bin/make -f
+ +
+CONFIGURE=./configure +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 nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
+ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
+ if test -d nx-X11; then \ + if test -d nx-X11; then \
...@@ -42,3 +43,21 @@ Last-Update: 2011-12-31 ...@@ -42,3 +43,21 @@ Last-Update: 2011-12-31
+ else \ + else \
+ ${MAKE} build-full; \ + ${MAKE} build-full; \
+ fi + 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment