[project @ 2001-06-14 12:50:05 by simonpj]

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

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 51d5ebc..5f6db64 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.30 2001/03/23 16:36:22 simonmar Exp $
+# $Id: paths.mk,v 1.32 2001/06/14 12:50:07 simonpj Exp $
 #
 # ghc project specific make variables
 #
@@ -16,22 +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_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_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
+