Define $(prog)_INPLACE variables automatically, and start using them

4 files changed, 18 insertions, 18 deletions

diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk
index 805fd6f697..cd42cb4e34 100644
--- a/utils/genapply/ghc.mk
+++ b/utils/genapply/ghc.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 utils/genapply_dist_MODULES = GenApply
-utils/genapply_dist_PROG    = $(GHC_GENAPPLY_PGM)
+utils/genapply_dist_PROG    = genapply$(exeext)
 utils/genapply_dist_INSTALL_INPLACE = YES
 
 utils/genapply_HC_OPTS += -package pretty
diff --git a/utils/genprimopcode/ghc.mk b/utils/genprimopcode/ghc.mk
index d119d8dfb3..b4fb6c01de 100644
--- a/utils/genprimopcode/ghc.mk
+++ b/utils/genprimopcode/ghc.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 utils/genprimopcode_dist_MODULES = Lexer Main ParserM Parser Syntax
-utils/genprimopcode_dist_PROG    = $(GHC_GENPRIMOP_PGM)
+utils/genprimopcode_dist_PROG    = genprimopcode$(exeext)
 utils/genprimopcode_dist_HC_OPTS = -package array
 utils/genprimopcode_dist_INSTALL_INPLACE = YES
 
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index e95fa62f07..c72f1a1a31 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -18,15 +18,15 @@ CABAL_DOTTED_VERSION := $(shell grep "^Version:" libraries/Cabal/Cabal/Cabal.cab
 CABAL_VERSION := $(subst .,$(comma),$(CABAL_DOTTED_VERSION))
 CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
 
-$(GHC_CABAL_INPLACE) : $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/.
+$(GHC_CABAL_INPLACE) : utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/.
 	"$(CP)" $< $@
 
-$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs)
-$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs)
-$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs)
+utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs)
+utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs)
+utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs)
 
-$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
-	"$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \
+utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
+	"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-cabal/Main.hs -o $@ \
 	       -no-user-$(GHC_PACKAGE_DB_FLAG) \
 	       -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
@@ -42,21 +42,21 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(T
 # touch is required, because otherwise if mkdirhier is newer, we
 # repeatedly rebuild ghc-cabal.
 
-$(eval $(call clean-target,$(GHC_CABAL_DIR),dist,\
-   $(GHC_CABAL_DIR)/dist bootstrapping))
+$(eval $(call clean-target,utils/ghc-cabal,dist,\
+   utils/ghc-cabal/dist bootstrapping))
 
-$(eval $(call all-target,$(GHC_CABAL_DIR),$(GHC_CABAL_INPLACE)))
+$(eval $(call all-target,utils/ghc-cabal,$(GHC_CABAL_INPLACE)))
 
 # -----------------------------------------------------------------------------
 # Now make another copy that goes in bindists. This needs to be built
 # with the in-tree compiler.
 
-$(GHC_CABAL_DIR)_USES_CABAL                   = YES
-$(GHC_CABAL_DIR)_PACKAGE                      = ghc-cabal
-$(GHC_CABAL_DIR)_dist-install_PROG            = ghc-cabal$(exeext)
-$(GHC_CABAL_DIR)_dist-install_INSTALL_INPLACE = NO
-$(GHC_CABAL_DIR)_dist-install_WANT_BINDIST_WRAPPER = YES
-$(GHC_CABAL_DIR)_dist-install_MODULES         = Main
+utils/ghc-cabal_USES_CABAL                   = YES
+utils/ghc-cabal_PACKAGE                      = ghc-cabal
+utils/ghc-cabal_dist-install_PROG            = ghc-cabal$(exeext)
+utils/ghc-cabal_dist-install_INSTALL_INPLACE = NO
+utils/ghc-cabal_dist-install_WANT_BINDIST_WRAPPER = YES
+utils/ghc-cabal_dist-install_MODULES         = Main
 
 $(eval $(call build-prog,utils/ghc-cabal,dist-install,1))
 
diff --git a/utils/touchy/ghc.mk b/utils/touchy/ghc.mk
index 458f80e5ed..8c316ba993 100644
--- a/utils/touchy/ghc.mk
+++ b/utils/touchy/ghc.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 utils/touchy_dist_C_SRCS          = touchy.c
-utils/touchy_dist_PROG            = $(GHC_TOUCHY_PGM)
+utils/touchy_dist_PROG            = touchy$(exeext)
 utils/touchy_dist_TOPDIR          = YES
 utils/touchy_dist_INSTALL         = YES
 utils/touchy_dist_INSTALL_INPLACE = YES