aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-07 21:00:44 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-07 21:00:44 +0100
commit54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (patch)
tree1cd9b4796132fa92dbfc31ce04d5ca37931b34cc
parent7f7cb5d874a857ab59bef7427734d8edfcca85bd (diff)
downloadnx-libs-54792fe297c0965c5c5d3a5db0280d064e2d7fa2.tar.gz
nx-libs-54792fe297c0965c5c5d3a5db0280d064e2d7fa2.tar.bz2
nx-libs-54792fe297c0965c5c5d3a5db0280d064e2d7fa2.zip
another fix for the main Makefile
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch23
1 files changed, 13 insertions, 10 deletions
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 7cd932111..f10144608 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@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