remove empty dir

[ghc-hetmet.git] / ghc / mk / paths.mk

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 0ead044..2e86122 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.39 2002/02/12 15:17:22 simonmar Exp $
+# $Id: paths.mk,v 1.44 2004/11/11 09:36:40 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -17,15 +17,18 @@ GHC_COMPILER_DIR_REL        = compiler
 GHC_RUNTIME_DIR_REL    = rts
 GHC_UTILS_DIR_REL      = utils
 GHC_DRIVER_DIR_REL     = driver
+GHC_LIB_DIR_REL                = lib
 
 GHC_UNLIT_DIR_REL      = $(GHC_UTILS_DIR_REL)/unlit
-GHC_HSTAGS_DIR_REL     = $(GHC_UTILS_DIR_REL)/hstags
+GHC_HSTAGS_DIR_REL     = $(GHC_UTILS_DIR_REL)/hasktags
 GHC_TOUCHY_DIR_REL     = $(GHC_UTILS_DIR_REL)/touchy
 GHC_PKG_DIR_REL                = $(GHC_UTILS_DIR_REL)/ghc-pkg
 GHC_GENPRIMOP_DIR_REL  = $(GHC_UTILS_DIR_REL)/genprimopcode
+GHC_GENAPPLY_DIR_REL   = $(GHC_UTILS_DIR_REL)/genapply
 GHC_MANGLER_DIR_REL    = $(GHC_DRIVER_DIR_REL)/mangler
 GHC_SPLIT_DIR_REL      = $(GHC_DRIVER_DIR_REL)/split
 GHC_SYSMAN_DIR_REL     = $(GHC_RUNTIME_DIR_REL)/parallel
+GHC_LIB_COMPAT_DIR_REL = $(GHC_LIB_DIR_REL)/compat
 
 GHC_INCLUDE_DIR        = $(GHC_TOP)/$(GHC_INCLUDE_DIR_REL)
 GHC_COMPILER_DIR       = $(GHC_TOP)/$(GHC_COMPILER_DIR_REL)
@@ -34,22 +37,25 @@ GHC_UTILS_DIR               = $(GHC_TOP)/$(GHC_UTILS_DIR_REL)
 GHC_DRIVER_DIR         = $(GHC_TOP)/$(GHC_DRIVER_DIR_REL)
 GHC_PKG_DIR            = $(GHC_TOP)/$(GHC_PKG_DIR_REL)
 GHC_GENPRIMOP_DIR      = $(GHC_TOP)/$(GHC_GENPRIMOP_DIR_REL)
-
-GHC_LIB_DIR            = $(FPTOOLS_TOP)/libraries
+GHC_GENAPPLY_DIR       = $(GHC_TOP)/$(GHC_GENAPPLY_DIR_REL)
+GHC_MANGLER_DIR         = $(GHC_TOP)/$(GHC_MANGLER_DIR_REL)
+GHC_SPLIT_DIR           = $(GHC_TOP)/$(GHC_SPLIT_DIR_REL)
+GHC_LIB_COMPAT_DIR      = $(GHC_TOP)/$(GHC_LIB_COMPAT_DIR_REL)
 
 # -----------------------------------------------------------------------------
 # Names of programs in the GHC tree
 #
 #      xxx_PGM         the name of an executable, without the path
 
-GHC_UNLIT_PGM          = unlit$(EXE_SUFFIX)
-GHC_HSTAGS_PGM         = hstags
-GHC_TOUCHY_PGM         = touchy$(EXE_SUFFIX)
+GHC_UNLIT_PGM          = unlit$(exeext)
+GHC_HSTAGS_PGM         = hasktags
+GHC_TOUCHY_PGM         = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
 GHC_SPLIT_PGM          = ghc-split
 GHC_SYSMAN_PGM                 = SysMan
 GHC_PKG_INPLACE_PGM    = ghc-pkg-inplace
 GHC_GENPRIMOP_PGM      = genprimopcode
+GHC_GENAPPLY_PGM       = genapply
 
 # -----------------------------------------------------------------------------
 # Auxilliary programs used by GHC
@@ -71,3 +77,4 @@ GHC_SPLIT             = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
 GHC_SYSMAN             = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
 GHC_PKG_INPLACE                = $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM)
 GHC_GENPRIMOP          = $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM)
+GHC_GENAPPLY           = $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM)