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

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 65faaed..5f6db64 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.31 2001/05/27 23:55:07 sof Exp $
+# $Id: paths.mk,v 1.32 2001/06/14 12:50:07 simonpj Exp $
 #
 # ghc project specific make variables
 #
@@ -16,24 +16,53 @@ endif
 
 #-----------------------------------------------------------------------------
 # Extra things ``only for'' for the ghc project
+# 	These are all build-time things
 
-GHC_DRIVER_DIR	    	:= $(TOP)/driver
+GHC_INCLUDE_DIR   	:= $(TOP)/includes
 GHC_COMPILER_DIR  	:= $(TOP)/compiler
 GHC_RUNTIME_DIR   	:= $(TOP)/rts
 GHC_LIB_DIR	 	:= $(TOP)/lib
-GHC_INCLUDE_DIR   	:= $(TOP)/includes
-GHC_UTILS_DIR	 	:= $(TOP)/utils
 GHC_INTERPRETER_DIR 	:= $(TOP)/interpreter
 
-GHC_UNLIT_DIR 		:= $(GHC_UTILS_DIR)/unlit
-GHC_TOUCHY_DIR 		:= $(GHC_UTILS_DIR)/touchy
-GHC_MANGLER_DIR 	:= $(GHC_DRIVER_DIR)/mangler
-GHC_SPLIT_DIR	 	:= $(GHC_DRIVER_DIR)/split
+# ---------------------------------------------------
+# -- These variables are defined primarily so they can 
+# -- be spat into Config.hs by ghc/compiler/Makefile
+#
+# -- See comments in ghc/compiler/main/SysTools.lhs 
+
+
+PROJECT_DIR		:= ghc
+GHC_DRIVER_DIR	    	:= $(PROJECT_DIR)/driver
+GHC_UTILS_DIR	 	:= $(PROJECT_DIR)/utils
+
+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
 
-GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit$(EXE_SUFFIX)
-GHC_TOUCHY              = $(GHC_TOUCHY_DIR)/touchy$(EXE_SUFFIX)
-GHC_MANGLER		= $(GHC_MANGLER_DIR)/ghc-asm
-GHC_SPLIT		= $(GHC_SPLIT_DIR)/ghc-split
+GHC_SPLIT_DIR	 	= $(GHC_DRIVER_DIR)/split
+GHC_SPLIT		= ghc-split
 
 GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/parallel/SysMan
 GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/parallel
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+
+GHC_CP			= "copy /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
+