From 09d2732b4e299eaa06c64b7a683529e337691c59 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 16:23:43 +0100 Subject: Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification. --- .../patches/0030_nx-X11_configure-args.full.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 debian/patches/0030_nx-X11_configure-args.full.patch (limited to 'debian/patches/0030_nx-X11_configure-args.full.patch') diff --git a/debian/patches/0030_nx-X11_configure-args.full.patch b/debian/patches/0030_nx-X11_configure-args.full.patch new file mode 100644 index 000000000..67184d330 --- /dev/null +++ b/debian/patches/0030_nx-X11_configure-args.full.patch @@ -0,0 +1,51 @@ +Description: Allow to pass in configure args. + Allow to pass in configure args. +Forward: pending +Author: Jan Engelhardt +Last-Update: 2012-02-14 +--- + nx-X11/lib/X11/Imakefile | 6 ++++-- + nx-X11/programs/Xserver/Imakefile | 4 +++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +Index: nx-X11/lib/X11/Imakefile +=================================================================== +--- a/nx-X11/lib/X11/Imakefile ++++ b/nx-X11/lib/X11/Imakefile +@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h + + includes:: ks_tables.h + ++CONFIGURE ?= ./configure ++ + #if NXLibraries + + $(NX_XCOMPCONFIGTARGET): + cd ../../../nxcomp && \ +- ./configure ++ ${CONFIGURE} + + $(NX_XCOMPEXTCONFIGTARGET): + cd ../../../nxcompext && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) +Index: nx-X11/programs/Xserver/Imakefile +=================================================================== +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps + NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) + NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status + ++CONFIGURE ?= ./configure ++ + $(NX_XSHADOWCONFIGTARGET): + cd $(NX_XSHADOWLIBDIR) && \ +- ./configure ++ ${CONFIGURE} + + #ifdef SunArchitecture + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) -- cgit v1.2.3