diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-01-19 22:14:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-01-19 22:14:40 +0000 |
| commit | 0134939d25e081fd1c8aa57943a22e5d824e95f7 (patch) | |
| tree | e55ddff63794b7157a2fb34b0c90e86fb82c433e /rules | |
| parent | 1bf79d5dc5f57ef5c8d67fe54f2d58cb22db0b32 (diff) | |
| download | haskell-0134939d25e081fd1c8aa57943a22e5d824e95f7.tar.gz | |
Escape some $s in makefiles for consistency
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 2 | ||||
| -rw-r--r-- | rules/build-package.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index ef4477fcec..25aa74ffbc 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -54,7 +54,7 @@ ifeq "$3" "dyn" # Link a dynamic library # On windows we have to supply the extra libs this one links to when building it. -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) "$$($1_$2_HC)" $$($1_$2_$3_ALL_OBJS) \ `$$($1_$2_$3_MKSTUBOBJS)` \ diff --git a/rules/build-package.mk b/rules/build-package.mk index 4005c73179..f40d0fcf25 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -135,7 +135,7 @@ endif endif # C and S files are possibly built the "dyn" way. -ifeq "$(BuildSharedLibs)" "YES" +ifeq "$$(BuildSharedLibs)" "YES" $(call c-objs,$1,$2,dyn) $(call c-suffix-rules,$1,$2,dyn,YES) endif |