[commit: ghc] master: Use unlit_INPLACE rather than UNLIT in the build system (1cb4b90)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1cb4b90334c17ea86606ef37ff6e0461ea56396a

>---------------------------------------------------------------

commit 1cb4b90334c17ea86606ef37ff6e0461ea56396a
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 3 20:27:51 2013 +0000

    Use unlit_INPLACE rather than UNLIT in the build system

>---------------------------------------------------------------

 compiler/ghc.mk     | 2 +-
 ghc/ghc.mk          | 2 +-
 mk/config.mk.in     | 2 --
 rules/build-perl.mk | 4 ++--
 utils/unlit/ghc.mk  | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 0cceed0..a27208b 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -102,7 +102,7 @@ endif
 	@echo 'cRAWCPP_FLAGS         :: String'                             >> $@
 	@echo 'cRAWCPP_FLAGS         = "$(RAWCPP_FLAGS)"'                   >> $@
 	@echo 'cGHC_UNLIT_PGM        :: String'                             >> $@
-	@echo 'cGHC_UNLIT_PGM        = "$(GHC_UNLIT_PGM)"'                  >> $@
+	@echo 'cGHC_UNLIT_PGM        = "$(utils/unlit_dist_PROG)"'          >> $@
 	@echo 'cGHC_SPLIT_PGM        :: String'                             >> $@
 	@echo 'cGHC_SPLIT_PGM        = "$(GHC_SPLIT_PGM)"'                  >> $@
 	@echo 'cLibFFI               :: Bool'                               >> $@
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 13a3e54..73d0253 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -141,7 +141,7 @@ $(INPLACE_LIB)/platformConstants: $(includes_GHCCONSTANTS_HASKELL_VALUE)
 # The GHC programs need to depend on all the helper programs they might call,
 # and the settings files they use
 
-GHC_DEPENDENCIES += $(UNLIT)
+GHC_DEPENDENCIES += $$(unlit_INPLACE)
 GHC_DEPENDENCIES += $(INPLACE_LIB)/settings
 GHC_DEPENDENCIES += $(INPLACE_LIB)/platformConstants
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1488a5a..69bb2b8 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -434,11 +434,9 @@ SRC_FLEX_OPTS	+= -8
 #      xxx_PGM          the name of an executable, without the path
 #      xxx              the executable relative to the current dir
 
-GHC_UNLIT_PGM           = unlit$(exeext)
 GHC_SPLIT_PGM           = ghc-split
 
 SPLIT               = $(INPLACE_LIB)/$(GHC_SPLIT_PGM)
-UNLIT               = $(INPLACE_LIB)/$(GHC_UNLIT_PGM)
 TOUCHY              = $(INPLACE_LIB)/touchy$(exeext)
 MKDIRHIER           = $(INPLACE_BIN)/mkdirhier
 
diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index b39134f..74c05b5 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -39,8 +39,8 @@ clean_$1 : clean_$1_$2
 # INPLACE_BIN etc. might be empty if we're cleaning
 ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 ifneq "$$(BINDIST)" "YES"
-$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT) | $$$$(dir $$$$@)/.
-	"$$(UNLIT)" $$(UNLIT_OPTS) $$< $$@
+$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$$$(unlit_INPLACE) | $$$$(dir $$$$@)/.
+	"$$(unlit_INPLACE)" $$(UNLIT_OPTS) $$< $$@
 endif
 
 $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl
diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk
index 1bdf4a0..597a901 100644
--- a/utils/unlit/ghc.mk
+++ b/utils/unlit/ghc.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 utils/unlit_dist_C_SRCS  = unlit.c
-utils/unlit_dist_PROG    = $(GHC_UNLIT_PGM)
+utils/unlit_dist_PROG    = unlit$(exeext)
 utils/unlit_dist_TOPDIR  = YES
 utils/unlit_dist_INSTALL = YES
 utils/unlit_dist_INSTALL_INPLACE = YES