Commit 9f4b494f authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Mike Gabriel

Allow to pass in configure args (030_nx-X11_configure-args.full.patch).

parent bd10fe59
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(-)
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)
030_nx-X11_configure-args.full.patch
031_nx-X11_parallel-make.full.patch 031_nx-X11_parallel-make.full.patch
051_nxcomp_macos105-fdisset.full+lite.patch 051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch
......
...@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c ...@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
includes:: ks_tables.h includes:: ks_tables.h
CONFIGURE ?= ./configure
#if NXLibraries #if NXLibraries
$(NX_XCOMPCONFIGTARGET): $(NX_XCOMPCONFIGTARGET):
cd ../../../nxcomp && \ cd ../../../nxcomp && \
./configure ${CONFIGURE}
$(NX_XCOMPEXTCONFIGTARGET): $(NX_XCOMPEXTCONFIGTARGET):
cd ../../../nxcompext && \ cd ../../../nxcompext && \
./configure ${CONFIGURE}
#ifdef SunArchitecture #ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
......
...@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcompshad ...@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcompshad
NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
CONFIGURE ?= ./configure
$(NX_XSHADOWCONFIGTARGET): $(NX_XSHADOWCONFIGTARGET):
cd $(NX_XSHADOWLIBDIR) && \ cd $(NX_XSHADOWLIBDIR) && \
./configure ${CONFIGURE}
#ifdef SunArchitecture #ifdef SunArchitecture
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment