summaryrefslogtreecommitdiff
path: root/rules/package-config.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-05-30 22:00:21 +0000
committerIan Lynagh <igloo@earth.li>2009-05-30 22:00:21 +0000
commit0ef6ba7b28187a4bf5309f9702eeaf53a281204b (patch)
tree653c84d5647c6efa71836dbd7a7231b2ae725988 /rules/package-config.mk
parentd5629b335a3254612887be8091b76dbdf2b582f8 (diff)
downloadhaskell-0ef6ba7b28187a4bf5309f9702eeaf53a281204b.tar.gz
Quote commands that we run, so they work if there are space in their paths
I've also added some missing $s to some makefiles. These aren't technically necessary, but it's nice to be consistent.
Diffstat (limited to 'rules/package-config.mk')
-rw-r--r--rules/package-config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/package-config.mk b/rules/package-config.mk
index 2801ff56b6..e1c563235e 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -17,7 +17,7 @@ $1_$2_HC = $$(GHC_STAGE$3)
# configuration stuff that depends on which GHC we're building with
ifeq "$3" "0"
-$1_$2_ghc_ge_609 = $(ghc_ge_609)
+$1_$2_ghc_ge_609 = $$(ghc_ge_609)
$1_$2_HC_CONFIG = $$(GHC_STAGE0)
$1_$2_HC_CONFIG_DEP =
$1_$2_GHC_PKG = $$(GHC_PKG)
@@ -28,7 +28,7 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC)
$1_$2_HC_MK_DEPEND_DEP =
$1_$2_HC_DEP =
ifeq "$$($1_$2_USE_BOOT_LIBS)" "YES"
-$1_$2_HC_PKGCONF = -package-conf $(BOOTSTRAPPING_CONF)
+$1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
$1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
endif