Reorganisation of the source tree

[ghc-hetmet.git] / utils / hsc2hs / Makefile

diff --git a/ghc/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
similarity index 92%
rename from ghc/utils/hsc2hs/Makefile
rename to utils/hsc2hs/Makefile
index ccaf68e..0216983 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -5,13 +5,10 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
-CURRENT_DIR=ghc/utils/hsc2hs
-INCLUDE_DIR=ghc/includes
-
 INSTALLING=1
 
 # This causes libghccompat.a to be used:
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
@@ -59,14 +56,14 @@ HSC2HS_DIR=$(libdir)
 HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
-HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
-HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(CURRENT_DIR)
+HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)
+HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_HSC2HS_DIR_REL)
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
 endif
 
-HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(INCLUDE_DIR)"
+HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_INCLUDE_DIR_REL)"
 endif
 
 $(SCRIPT_PROG) : Makefile