Use more of the automatically generated INPLACE variables

4 files changed, 9 insertions, 9 deletions

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 41f7a02be1..0380f7c5e5 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -99,16 +99,16 @@ $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk
 # This rule configures the package, generates the package-data.mk file
 # for our build system, and registers the package for use in-place in
 # the build tree.
-$1/$2/package-data.mk : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_CONFIG_DEP)
+$1/$2/package-data.mk : $$$$(ghc-cabal_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_CONFIG_DEP)
 # Checking packages built with the bootstrapping compiler would
 # generally be a waste of time. Either we will rebuild them with
 # stage1/stage2, or we don't really care about them.
 ifneq "$3" "0"
 ifneq "$$($1_NO_CHECK)" "YES"
-	"$$(GHC_CABAL_INPLACE)" check $1
+	"$$(ghc-cabal_INPLACE)" check $1
 endif
 endif
-	"$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
+	"$$(ghc-cabal_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
 ifeq "$$($1_$2_PROG)" ""
 ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
 	$$(call cmd,$1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
diff --git a/rules/haddock.mk b/rules/haddock.mk
index 4ef0fb1c6e..7efb29aa7d 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -43,9 +43,9 @@ ifneq "$$(BINDIST)" "YES"
 # We need the quadruple dollars for the dependencies, as it isn't
 # guaranteed that we are processing the packages in dependency order,
 # so we don't want to expand it yet.
-$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/.
+$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$$$(ghc-cabal_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/.
 ifeq "$$(HSCOLOUR_SRCS)" "YES"
-	"$$(GHC_CABAL_INPLACE)" hscolour $2 $1
+	"$$(ghc-cabal_INPLACE)" hscolour $2 $1
 endif
 	"$$(TOP)/$$(INPLACE_BIN)/haddock" \
 	  --odir="$1/$2/doc/html/$$($1_PACKAGE)" \
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 568d70887b..da6b3b61d9 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -15,7 +15,7 @@ define manual-package-config # args: $1 = dir
 $(call trace, manual-package-config($1))
 $(call profStart, manual-package-config($1))
 
-$1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE)
+$1/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE)
 	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DTOP='"$$(TOP)"' \
 		$$($1_PACKAGE_CPP_OPTS) \
@@ -23,7 +23,7 @@ $1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE)
 	grep -v '^#pragma GCC' $$@.raw | \
 	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' > $$@
 
-	"$$(GHC_PKG_INPLACE)" update --force $$@
+	"$$(ghc-pkg_INPLACE)" update --force $$@
 
 # This is actually a real file, but we need to recreate it on every
 # "make install", so we declare it as phony
diff --git a/rules/package-config.mk b/rules/package-config.mk
index a49ab9862a..664769409c 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -43,8 +43,8 @@ else
 $1_$2_HC_PKGCONF = 
 $1_$2_HC_CONFIG = $$(TOP)/$$(GHC_STAGE1)
 $1_$2_HC_CONFIG_DEP = $$(GHC_STAGE1)
-$1_$2_GHC_PKG = $$(TOP)/$$(GHC_PKG_INPLACE)
-$1_$2_GHC_PKG_DEP = $$(GHC_PKG_INPLACE)
+$1_$2_GHC_PKG = $$(TOP)/$$(ghc-pkg_INPLACE)
+$1_$2_GHC_PKG_DEP = $$$$(ghc-pkg_INPLACE)
 $1_$2_GHC_PKG_OPTS =
 # If stage is not 0 then we always use stage1 for making .depend, as later
 # stages aren't available early enough