From dd5f7cf05d67b0512abc22d1f54bc2316df2ba0f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 1 Dec 2009 13:36:09 +0000 Subject: [PATCH] Delay expansion of some makefile variables until they are available --- rules/distdir-way-opts.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index ac7c0d8..a81aa22 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -77,7 +77,7 @@ endif # We have to do this mangling using the shell, because words may contain # spaces and GNU make doesn't have any quoting interpretation. -ifneq ($(strip $($1_$2_DEP_INCLUDE_DIRS)),) +ifneq ($$(strip $$($1_$2_DEP_INCLUDE_DIRS)),) $1_$2_CC_INC_FLAGS:=$$(shell for i in $$($1_$2_DEP_INCLUDE_DIRS); do echo $$($1_$2_DEP_INCLUDE_DIRS_FLAG)\"$$$$i\"; done) endif @@ -92,7 +92,7 @@ $1_$2_DIST_CC_OPTS = \ $$($1_$2_CC_INC_FLAGS) \ $$($1_$2_DEP_CC_OPTS) -ifneq ($(strip $($1_$2_DEP_LIB_DIRS)),) +ifneq ($$(strip $$($1_$2_DEP_LIB_DIRS)),) $1_$2_DIST_LD_LIB_DIRS:=$$(shell for i in $$($1_$2_DEP_LIB_DIRS); do echo \"-L$$$$i\"; done) endif @@ -108,10 +108,10 @@ $1_$2_DIST_LD_OPTS = \ # c.f. Cabal's Distribution.Simple.PreProcess.ppHsc2hs # We use '' around cflags and lflags to handle paths with backslashes in # on Windows -ifneq ($(strip $($1_$2_DIST_CC_OPTS)),) +ifneq ($$(strip $$($1_$2_DIST_CC_OPTS)),) $1_$2_$3_HSC2HS_CC_OPTS:=$$(shell for i in $$($1_$2_DIST_CC_OPTS); do echo \'--cflag=$$$$i\'; done) endif -ifneq ($(strip $($1_$2_DIST_LD_OPTS)),) +ifneq ($$(strip $$($1_$2_DIST_LD_OPTS)),) $1_$2_$3_HSC2HS_LD_OPTS:=$$(shell for i in $$($1_$2_DIST_LD_OPTS); do echo \'--lflag=$$$$i\'; done) endif -- 1.7.10.4