Convert some more variable names to FOO_CMD, for consistency

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

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

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