From 0134939d25e081fd1c8aa57943a22e5d824e95f7 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 19 Jan 2010 22:14:40 +0000 Subject: [PATCH] Escape some $s in makefiles for consistency --- rules/build-package-way.mk | 2 +- 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 ef4477f..25aa74f 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 4005c73..f40d0fc 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 -- 1.7.10.4