threadPaused: fix pointer arithmetic

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e1a124c..201ca88 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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@