From 4108894c6e92887fe03c2397ff5a8c424413aad6 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Wed, 16 Jun 2010 17:59:16 +0000
Subject: [PATCH] Convert some more variable names to FOO_CMD, for consistency

---
 ghc.mk                      |    6 +++---
 mk/config.mk.in             |   21 ++++-----------------
 rules/build-package-data.mk |    2 +-
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 661305e..2bee6d6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1000,10 +1000,10 @@ windows-binary-dist-prep:
 	cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
-ifeq "$(ISCC)" ""
-	@echo No ISCC, so not making installer
+ifeq "$(ISCC_CMD)" ""
+	@echo No ISCC_CMD, so not making installer
 else
-	"$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+	"$(ISCC_CMD)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
 endif
 
 # tryTimes tries to run its third argument multiple times, until it
diff --git a/mk/config.mk.in b/mk/config.mk.in
index ac5b293..6562ae1 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -656,35 +656,22 @@ endif
 #
 REAL_SHELL     = $(SHELL)
 
-SIZE_CMD       = size
 STRIP_CMD      = strip
 PATCH_CMD      = @PatchCmd@
 TAR_CMD        = @TarCmd@
 BZIP2_CMD      = bzip2
 GZIP_CMD       = gzip
 
-HSCOLOUR = @HSCOLOUR@
+HSCOLOUR_CMD   = @HSCOLOUR@
 
-#
-# This is special to literate/, ToDo: add literate-specific
-# configure setup to literate/.
-#
-TBL 			= tbl
-TEX			= tex
-TGRIND 			= tgrind
-TGRIND_HELPER 		= /usr/local/lib/tgrind/tfontedpr # XXX
-TIB			= tib
-
-TIME			= @TimeCmd@
-TROFF			= troff
-UNAME			= uname
+TIME_CMD       = @TimeCmd@
 
 # GTK+
-GTK_CONFIG = @GTK_CONFIG@
+GTK_CONFIG_CMD = @GTK_CONFIG@
 
 # Set this if you want to use Inno Setup to build a Windows installer
 # when you make a bindist
-ISCC                    =
+ISCC_CMD       =
 
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 93919ff..f508b81 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -25,7 +25,7 @@ $1_$2_CONFIGURE_OPTS += --enable-shared
 endif
 
 ifeq "$$(HSCOLOUR_SRCS)" "YES"
-$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR)"
+$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR_CMD)"
 endif
 
 # We filter out -Werror from SRC_CC_OPTS, because when configure tests
-- 
1.7.10.4