aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/030_nx-X11_configure-args.full.diff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:42:48 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:42:48 +0100
commit01e97f0f829b90411a15c70b082a7823a26ae61f (patch)
tree7bfe16fd2eb3246b483709fdb13446a70e880fdb /debian/patches/030_nx-X11_configure-args.full.diff
parentc621c22f820ec22fe7daabf37b7b577a41a3298f (diff)
downloadnx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.tar.gz
nx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.tar.bz2
nx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.zip
Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name.
Diffstat (limited to 'debian/patches/030_nx-X11_configure-args.full.diff')
-rw-r--r--debian/patches/030_nx-X11_configure-args.full.diff52
1 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/030_nx-X11_configure-args.full.diff b/debian/patches/030_nx-X11_configure-args.full.diff
new file mode 100644
index 000000000..3bc910003
--- /dev/null
+++ b/debian/patches/030_nx-X11_configure-args.full.diff
@@ -0,0 +1,52 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2012-01-26 23:30:37.605560191 +0100
+Upstream: pending
+
+Allow to pass in configure args.
+
+---
+ 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)