aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-02 15:55:33 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-01-02 15:55:33 +0100
commitbfe6f4349e15fe2ae70e773552e1dc080f04b68d (patch)
treecffdbeaafe214a875c47ca0e4777f2bca43fd873 /debian/patches
parent36a2247e0e65d7b30f95687aaa43f51c373fcc24 (diff)
downloadnx-libs-bfe6f4349e15fe2ae70e773552e1dc080f04b68d.tar.gz
nx-libs-bfe6f4349e15fe2ae70e773552e1dc080f04b68d.tar.bz2
nx-libs-bfe6f4349e15fe2ae70e773552e1dc080f04b68d.zip
Continue Reinhard's work on top-level install/uninstall. Esp. integrate debian/post-nx-build.sh into main Makefile. Make value of CONFIGURE variable traversable through the Makefile tree.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/030_nx-X11_configure-args.full.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch
index 8304ca795..67184d330 100644
--- a/debian/patches/030_nx-X11_configure-args.full.patch
+++ b/debian/patches/030_nx-X11_configure-args.full.patch
@@ -16,7 +16,7 @@ Index: nx-X11/lib/X11/Imakefile
includes:: ks_tables.h
-+CONFIGURE=./configure
++CONFIGURE ?= ./configure
+
#if NXLibraries
@@ -40,7 +40,7 @@ Index: nx-X11/programs/Xserver/Imakefile
NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
-+CONFIGURE=./configure
++CONFIGURE ?= ./configure
+
$(NX_XSHADOWCONFIGTARGET):
cd $(NX_XSHADOWLIBDIR) && \