[project @ 2002-09-30 10:13:23 by simonmar]

$(EXE_SUFFIX) duplicates $(exeext), and the latter seems to be more
widely used, so nuke the former.

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 5584e48..f8fb167 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.41 2002/08/09 21:28:09 sof Exp $
+# $Id: paths.mk,v 1.42 2002/09/30 10:13:23 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -45,9 +45,9 @@ GHC_LIB_DIR           = $(FPTOOLS_TOP)/libraries
 #
 #      xxx_PGM         the name of an executable, without the path
 
-GHC_UNLIT_PGM          = unlit$(EXE_SUFFIX)
+GHC_UNLIT_PGM          = unlit$(exeext)
 GHC_HSTAGS_PGM         = hasktags
-GHC_TOUCHY_PGM         = touchy$(EXE_SUFFIX)
+GHC_TOUCHY_PGM         = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
 GHC_SPLIT_PGM          = ghc-split
 GHC_SYSMAN_PGM                 = SysMan

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f148eff..38c09ef 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -786,11 +786,6 @@ TAR                        = @TarCmd@
 ZIP                    = zip
 
 #
-# Under Windows, we have to deal with .exe suffixes
-#
-EXE_SUFFIX=@exeext@
-
-#
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
 #
@@ -879,8 +874,8 @@ LIT2TEXT            = $(LITERATE_PREFIX)lit2text
 #
 # Stuff from fptools/ghc/utils
 #
-UNLIT                  = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-HP2PS                  = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
+UNLIT                  = $(UNLIT_PREFIX)unlit$(exeext)
+HP2PS                  = $(HP2PS_PREFIX)hp2ps$(exeext)
 HSTAGS                 = $(HSTAGS_PREFIX)hstags
 HSC2HS                 = $(HSC2HS_PREFIX)hsc2hs-inplace