diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
| commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
| tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /debian/patches/0030_nx-X11_configure-args.full.patch | |
| parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
| parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
| download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip | |
Merge branch '3.6.x'
Diffstat (limited to 'debian/patches/0030_nx-X11_configure-args.full.patch')
| -rw-r--r-- | debian/patches/0030_nx-X11_configure-args.full.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/debian/patches/0030_nx-X11_configure-args.full.patch b/debian/patches/0030_nx-X11_configure-args.full.patch deleted file mode 100644 index 674f6cc75..000000000 --- a/debian/patches/0030_nx-X11_configure-args.full.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Allow to pass in configure args. - Allow to pass in configure args. -Forward: pending -Author: Jan Engelhardt <jengelh@medozas.de> -Last-Update: 2012-02-14 ---- - nx-X11/lib/X11/Imakefile | 6 ++++-- - nx-X11/programs/Xserver/Imakefile | 4 +++- - 2 files changed, 7 insertions(+), 2 deletions(-) - ---- 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) ---- 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) |