[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.10-6-g54792fe
X2go dev team
git-admin at x2go.org
Tue Feb 7 21:00:49 CET 2012
The branch, master has been updated
via 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (commit)
from 7f7cb5d874a857ab59bef7427734d8edfcca85bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54792fe297c0965c5c5d3a5db0280d064e2d7fa2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Feb 7 21:00:44 2012 +0100
another fix for the main Makefile
-----------------------------------------------------------------------
Summary of changes:
.../patches/001_add-main-makefile.full+lite.patch | 23 +++++++++++--------
1 files changed, 13 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 7cd9321..f101446 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,11 +5,23 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
++%:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
++ if test -d nx-X11; then \
++ $(MAKE) -C nxcompext $@; \
++ $(MAKE) -C nxcompshad; \
++ $(MAKE) -C nx-X11 $@; \
++ fi
++
+all: build
+
++test:
++ echo "No testing for NX (redistributed)"
++
+build-lite:
+ cd nxcomp && autoconf && ./configure && $(MAKE)
+ cd nxproxy && autoconf && ./configure && $(MAKE)
@@ -28,12 +40,3 @@ Last-Update: 2011-12-31
+ else \
+ $(MAKE) build-full; \
+ fi
-+
-+%:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then \
-+ $(MAKE) -C nxcompext $@; \
-+ $(MAKE) -C nxcompshad; \
-+ $(MAKE) -C nx-X11 $@; \
-+ fi
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list