Rename some variables from FOO to FOO_CMD

This fixes a problem with commands like gzip, where if $GZIP is exported
in the environment, then when make runs a command it'll put the Makefile
variable's value in the environment. But gzip treats $GZIP as arguments
for itself, so when we run gzip it thinks we're giving it "gzip" as an
argument.

6 files changed, 17 insertions, 17 deletions

diff --git a/docs/storage-mgt/rp.tex b/docs/storage-mgt/rp.tex
index 2055894282..c8521901a6 100644
--- a/docs/storage-mgt/rp.tex
+++ b/docs/storage-mgt/rp.tex
@@ -176,14 +176,14 @@ Installing the GHC is done as follows:
     SplitObjs = NO
     GhcRtsHcOpts = 
     GhcRtsCcOpts = -g
-    STRIP =:
+    STRIP_CMD =:
 \end{code}
 @GhcLibWays@ tells the compiler to build the code for profiling as well.
 @GhcRtsHcOpts@ has additional flags for @gcc@ when compiling @.hc@ files.
 @GhcRtsCcOpts@ has additional flags for @gcc@ when compiling @.c@ files.
 Since we will implement retainer profiling in @.c@ files, we turn on the 
 debugging flag @-g@. 
-The empty setting for @STRIP@ tells the compiler not to remove source code
+The empty setting for @STRIP_CMD@ tells the compiler not to remove source code
 information (generated due to the @-g@ option) from executable files so that
 they can be examined with @gdb@.
 
diff --git a/ghc.mk b/ghc.mk
index eaf0e29c0a..661305e219 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -913,7 +913,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	    "$(GHC_CABAL_INPLACE)" install \
 		 "$(INSTALLED_GHC_REAL)" \
 		 "$(INSTALLED_GHC_PKG_REAL)" \
-		 "$(STRIP)" \
+		 "$(STRIP_CMD)" \
 		 "$(DESTDIR)$(topdir)" \
 		 $p $(INSTALL_DISTDIR_$p) \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
@@ -992,12 +992,12 @@ unix-binary-dist-prep:
 	"$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
 # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
 # tree then we want to include the real file, not a symlink to it
-	cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
+	cd bindistprep && "$(TAR_CMD)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-binary-dist-prep:
 	"$(RM)" $(RM_OPTS_REC) bindistprep/
 	$(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install
-	cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
+	cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
 ifeq "$(ISCC)" ""
@@ -1107,7 +1107,7 @@ sdist-prep :
 
 .PHONY: sdist
 sdist : sdist-prep
-	"$(TAR)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL)
+	"$(TAR_CMD)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL)
 
 sdist-manifest : $(SRC_DIST_TARBALL)
 	tar tjf $(SRC_DIST_TARBALL) | sed "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 3e230530a0..a8c72be12d 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -102,7 +102,7 @@ endif
 ifneq "$(BINDIST)" "YES"
 $(libffi_STAMP_CONFIGURE):
 	"$(RM)" $(RM_OPTS_REC) $(LIBFFI_DIR) libffi/build
-	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP) -d | { cd libffi && $(TAR) -xf - ; }
+	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
 	mv libffi/libffi-* libffi/build
 	chmod +x libffi/ln
 
diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index b43ef94dc8..bb8e20df22 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -145,4 +145,4 @@ endif
 
 # NoFib settings
 NoFibWays =
-STRIP=:
+STRIP_CMD = :
diff --git a/mk/config.mk.in b/mk/config.mk.in
index e1a124c579..ac5b29368f 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -654,14 +654,14 @@ endif
 # with REAL_SHELL set to something else than /bin/sh, for instance, your favourite
 # command shell.
 #
-REAL_SHELL=$(SHELL)
-SIZE			= size
-STRIP			= strip
-PATCH			= @PatchCmd@
-TAR			= @TarCmd@
-BZIP2                   = bzip2
-GZIP                    = gzip
-ZIP			= zip
+REAL_SHELL     = $(SHELL)
+
+SIZE_CMD       = size
+STRIP_CMD      = strip
+PATCH_CMD      = @PatchCmd@
+TAR_CMD        = @TarCmd@
+BZIP2_CMD      = bzip2
+GZIP_CMD       = gzip
 
 HSCOLOUR = @HSCOLOUR@
 
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 673e542bda..31c8853fdc 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -18,7 +18,7 @@ GhcLibHcOpts    += -O -dcore-lint
 GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
-STRIP           = :
+STRIP_CMD       = :
 
 CHECK_PACKAGES = YES