-################################################################################
-#
-# Utilities programs: where to find them
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-# FPtools Utility locations
-
-# By default, the various utils needed to be build ghc and chums
-# is set up to point to the utils/ directory. Define here the
-# path prefix for the utilities. Notice that it's a prefix with
-# a trailing slash, so that it can be concatenated directly on
-# front of a program name; if it's not set then we just look
-# along the shell's $(PATH)
-#
-# If instead you want to use installed or your own versions of these,
-# override the various *_PREFIX in build.mk, i.e., having the following
-# in build.mk:
-#
-# MKDEPENDC_PREFIX=
-#
-# will force `make' to rummage around in your PATH to find `mkdependC' (not
-# sure it would need it in the first place, but still).
-#
-GLAFP_UTILS = $(FPTOOLS_TOP)/glafp-utils
-
-SCRIPT_PREFIX = $(GLAFP_UTILS)/scripts/
-MKDEPENDC_PREFIX = $(GLAFP_UTILS)/mkdependC/
-LTX_PREFIX = $(GLAFP_UTILS)/ltx/
-RUNTEST_PREFIX = $(GLAFP_UTILS)/runstdtest/
-VERBATIM_PREFIX = $(GLAFP_UTILS)/verbatim/
-SGMLVERB_PREFIX = $(GLAFP_UTILS)/sgmlverb/
-ETAGS_PREFIX = $(GLAFP_UTILS)/etags/
-MSUB_PREFIX = $(GLAFP_UTILS)/msub/
-LNDIR_PREFIX = $(GLAFP_UTILS)/lndir/
-MKDIRHIER_PREFIX = $(GLAFP_UTILS)/mkdirhier/
-DOCBOOK_PREFIX = $(GLAFP_UTILS)/docbook/
+# -----------------------------------------------------------------------------
+# Names of programs in the GHC tree
+#
+# xxx_PGM the name of an executable, without the path
+# xxx the executable relative to the current dir
+
+GHC_UNLIT_PGM = unlit$(exeext)
+GHC_HP2PS_PGM = hp2ps$(exeext)
+GHC_GHCTAGS_PGM = ghctags$(exeext)
+GHC_HSC2HS_PGM = hsc2hs$(exeext)
+GHC_TOUCHY_PGM = touchy$(exeext)
+GHC_MANGLER_PGM = ghc-asm
+GHC_SPLIT_PGM = ghc-split
+GHC_SYSMAN_PGM = SysMan
+GHC_GENPRIMOP_PGM = genprimopcode$(exeext)
+GHC_GENAPPLY_PGM = genapply$(exeext)
+GHC_CABAL_PGM = ghc-cabal$(exeext)
+GHC_PKG_PGM = ghc-pkg$(exeext)
+GHC_LTX_PGM = ltx$(exeext)
+GHC_MKDIRHIER_PGM = mkdirhier
+GHC_LNDIR_PGM = lndir
+GHC_DUMMY_GHC_PGM = dummy-ghc$(exeext)