X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4d9e01b836b0202fcf6a6b75a47e120e1e610db4;hb=bc41b53dbec72e724c9fb8338eee8551d6d5cda1;hp=e1a124c579e9dd097b4c048d3c895747a319e625;hpb=49a8e5c021009430d373d6224b29004c7d18c408;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e1a124c..4d9e01b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -177,7 +177,7 @@ endif
 # Whether to use libffi for adjustors (foreign import "wrapper") or
 # not.  If we have built-in support (rts/Adjustor.c) then we use that,
 # otherwise we fall back on libffi, which is slightly slower.
-ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64 alpha powerpc ia64,),YES,NO))
+ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64 powerpc,),YES,NO))
 ifeq "$(ArchHasAdjustorSupport)" "YES"
 UseLibFFIForAdjustors=NO
 else
@@ -592,11 +592,7 @@ INSTALL			:= $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
 LATEX			= latex
 PDFLATEX        = pdflatex
 BIBTEX          = bibtex
-HEVEA			= hevea
-HACHA			= hacha
 LN_S			= @LN_S@
-MANMACROS		= -man
-MSMACROS 		= -ms
 MV			= mv
 NROFF			= nroff
 PERL 			= @PerlCmd@
@@ -654,37 +650,24 @@ 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)
 
-HSCOLOUR = @HSCOLOUR@
+STRIP_CMD      = strip
+PATCH_CMD      = @PatchCmd@
+TAR_CMD        = @TarCmd@
+BZIP2_CMD      = bzip2
+GZIP_CMD       = gzip
 
-#
-# 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
+HSCOLOUR_CMD   = @HSCOLOUR@
 
-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
@@ -712,12 +695,6 @@ BLD_DLL			= dllwrap
 GHC_PKG		        = @GhcPkgCmd@
 
 #
-# GreenCard
-#
-GREENCARD	        = @GreenCardCmd@
-GREENCARD_VERSION	= @GreenCardVersion@		
-
-#
 # Happy
 #
 HAPPY			= @HappyCmd@