aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch10
2 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 31384cf28..0b45f2f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script
currently requires ,,full'' or ,,full+lite'' in the file name.
* Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...).
+ * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE)
+ variable.
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 9f4351f91..3c236b9f2 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,9 +5,11 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+
++CONFIGURE=./configure
++
+%:
+ ${MAKE} -C nxcomp $@
+ ${MAKE} -C nxproxy $@
@@ -23,12 +25,12 @@ Last-Update: 2011-12-31
+ echo "No testing for NX (redistributed)"
+
+build-lite:
-+ cd nxcomp && autoconf && ./configure && ${MAKE}
-+ cd nxproxy && autoconf && ./configure && ${MAKE}
++ cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+
+build-full:
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
-+ cd nxcomp && autoconf && ./configure
++ cd nxcomp && autoconf
+ cd nxcompext && autoconf
+ cd nxcompshad && autoconf
+ cd nx-X11 && ${MAKE} World