Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
4108894c
Commit
4108894c
authored
Jun 16, 2010
by
Ian Lynagh
Browse files
Convert some more variable names to FOO_CMD, for consistency
parent
0481fe09
Changes
3
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
4108894c
...
...
@@ -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
View file @
4108894c
...
...
@@ -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
View file @
4108894c
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment