X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=f8fb16711d69f5997d04b769619042e5d1b0bb5c;hb=b5dcc5ca435e968850a163ffde027de065110d20;hp=5f6db64c6ae5891c5d36eaf52c6219c4766df05f;hpb=16d5d1c75c999677783c9c1bda519540fa9a6e58;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 5f6db64..f8fb167 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,68 +1,76 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.32 2001/06/14 12:50:07 simonpj Exp $
+# $Id: paths.mk,v 1.42 2002/09/30 10:13:23 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-#-----------------------------------------------------------------------------
-# HsTags
-
-ifdef UseInstalledUtils
-HSTAGS	 		= hstags
-else
-HSTAGS	 		= $(HSTAGS_DIR)/hstags
-HSTAGS_DIR 		= $(GHC_UTILS_DIR)/hstags
-endif
+PROJECT_DIR		:= ghc
 
 #-----------------------------------------------------------------------------
-# Extra things ``only for'' for the ghc project
-# 	These are all build-time things
-
-GHC_INCLUDE_DIR   	:= $(TOP)/includes
-GHC_COMPILER_DIR  	:= $(TOP)/compiler
-GHC_RUNTIME_DIR   	:= $(TOP)/rts
-GHC_LIB_DIR	 	:= $(TOP)/lib
-GHC_INTERPRETER_DIR 	:= $(TOP)/interpreter
-
-# ---------------------------------------------------
-# -- These variables are defined primarily so they can 
-# -- be spat into Config.hs by ghc/compiler/Makefile
+# Useful directories
 #
-# -- See comments in ghc/compiler/main/SysTools.lhs 
-
-
-PROJECT_DIR		:= ghc
-GHC_DRIVER_DIR	    	:= $(PROJECT_DIR)/driver
-GHC_UTILS_DIR	 	:= $(PROJECT_DIR)/utils
+#      xxx_DIR_REL      a directory relative to $(GHC_TOP)
+#      xxx_DIR          a directory (including $(GHC_TOP))
+
+GHC_INCLUDE_DIR_REL   	= includes
+GHC_COMPILER_DIR_REL  	= compiler
+GHC_RUNTIME_DIR_REL   	= rts
+GHC_UTILS_DIR_REL 	= utils
+GHC_DRIVER_DIR_REL	= driver
+
+GHC_UNLIT_DIR_REL	= $(GHC_UTILS_DIR_REL)/unlit
+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_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_INCLUDE_DIR   	= $(GHC_TOP)/$(GHC_INCLUDE_DIR_REL)
+GHC_COMPILER_DIR  	= $(GHC_TOP)/$(GHC_COMPILER_DIR_REL)
+GHC_RUNTIME_DIR   	= $(GHC_TOP)/$(GHC_RUNTIME_DIR_REL)
+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_MANGLER_DIR         = $(GHC_TOP)/$(GHC_MANGLER_DIR_REL)
+GHC_SPLIT_DIR           = $(GHC_TOP)/$(GHC_SPLIT_DIR_REL)
+
+
+GHC_LIB_DIR	 	= $(FPTOOLS_TOP)/libraries
 
-GHC_TOUCHY_DIR 		= $(GHC_UTILS_DIR)/touchy
-
-GHC_UNLIT_DIR 		= $(GHC_UTILS_DIR)/unlit
-GHC_UNLIT		= unlit$(EXE_SUFFIX)
-
-GHC_MANGLER_DIR 	= $(GHC_DRIVER_DIR)/mangler
-GHC_MANGLER		= ghc-asm
+# -----------------------------------------------------------------------------
+# Names of programs in the GHC tree
+#
+#      xxx_PGM	        the name of an executable, without the path
 
-GHC_SPLIT_DIR	 	= $(GHC_DRIVER_DIR)/split
-GHC_SPLIT		= ghc-split
+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_SYSMAN    		= $(GHC_RUNTIME_DIR)/parallel/SysMan
-GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/parallel
+# -----------------------------------------------------------------------------
+# Auxilliary programs used by GHC
+#
+#      xxx              the pathname to an executable (some using $(TOP))
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-
-GHC_CP			= "copy /y"
+GHC_CP			= "xcopy /y"
 GHC_PERL		= perl
-GHC_TOUCHY		= touchy$(EXE_SUFFIX)
-cGHC_RAWCPP		= $(subst -mwin32,,$(RAWCPP))
-#	Don't know why we do this...
-
 else
-
 GHC_CP			= $(CP)
 GHC_PERL		= $(PERL)
-GHC_TOUCHY		= touch
-GHC_RAWCPP		= $(RAWCPP)
-
 endif
 
+GHC_UNLIT		= $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
+GHC_HSTAGS		= $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
+GHC_MANGLER		= $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
+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)