Commit 4108894c authored by Ian Lynagh's avatar Ian Lynagh

Convert some more variable names to FOO_CMD, for consistency

parent 0481fe09
...@@ -1000,10 +1000,10 @@ windows-binary-dist-prep: ...@@ -1000,10 +1000,10 @@ windows-binary-dist-prep:
cd bindistprep && "$(TAR_CMD)" 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: windows-installer:
ifeq "$(ISCC)" "" ifeq "$(ISCC_CMD)" ""
@echo No ISCC, so not making installer @echo No ISCC_CMD, so not making installer
else else
"$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss "$(ISCC_CMD)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
endif endif
# tryTimes tries to run its third argument multiple times, until it # tryTimes tries to run its third argument multiple times, until it
......
...@@ -656,35 +656,22 @@ endif ...@@ -656,35 +656,22 @@ endif
# #
REAL_SHELL = $(SHELL) REAL_SHELL = $(SHELL)
SIZE_CMD = size
STRIP_CMD = strip STRIP_CMD = strip
PATCH_CMD = @PatchCmd@ PATCH_CMD = @PatchCmd@
TAR_CMD = @TarCmd@ TAR_CMD = @TarCmd@
BZIP2_CMD = bzip2 BZIP2_CMD = bzip2
GZIP_CMD = gzip GZIP_CMD = gzip
HSCOLOUR = @HSCOLOUR@ HSCOLOUR_CMD = @HSCOLOUR@
# TIME_CMD = @TimeCmd@
# 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
# GTK+ # GTK+
GTK_CONFIG = @GTK_CONFIG@ GTK_CONFIG_CMD = @GTK_CONFIG@
# Set this if you want to use Inno Setup to build a Windows installer # Set this if you want to use Inno Setup to build a Windows installer
# when you make a bindist # when you make a bindist
ISCC = ISCC_CMD =
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# DocBook XML stuff # DocBook XML stuff
......
...@@ -25,7 +25,7 @@ $1_$2_CONFIGURE_OPTS += --enable-shared ...@@ -25,7 +25,7 @@ $1_$2_CONFIGURE_OPTS += --enable-shared
endif endif
ifeq "$$(HSCOLOUR_SRCS)" "YES" ifeq "$$(HSCOLOUR_SRCS)" "YES"
$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR)" $1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR_CMD)"
endif endif
# We filter out -Werror from SRC_CC_OPTS, because when configure tests # We filter out -Werror from SRC_CC_OPTS, because when configure tests
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment