X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=19916eff9485e6b823e191126aaf3c13f408b858;hb=8102af4eac807ae4956a79b27f03fd890f8294c6;hp=e19e5606bccf408ffdafd8163b0bf004c645f714;hpb=14d3b9c995a69f021704a23451f6d68ba7d4607d;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index e19e560..19916ef 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -446,7 +446,7 @@ endif
 
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
-# Yes, include the interepreter, readline, and Template Haskell extensions
+# Yes, include the interepreter and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package template-haskell
 PKG_DEPENDS += template-haskell
 
@@ -493,7 +493,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
 else
--include $(FPTOOLS_TOP)/libraries/readline/config.mk
+-include $(FPTOOLS_TOP_ABS)/libraries/readline/config.mk
 # readline's config.mk sets PACKAGE, which we don't want here
 PACKAGE=
 ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
@@ -754,11 +754,9 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INPLACE_EXTRA_FLAGS = -optc-DWINDOWS
 endif
 
-$(INPLACE_SRC): ghc-inplace.c
-	$(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $@
-
-$(INPLACE_PROG): $(INPLACE_SRC)
-	$(HC) -cpp $(INPLACE_EXTRA_FLAGS) $< -o $@
+$(INPLACE_PROG): ghc-inplace.c
+	$(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $(INPLACE_SRC)
+	$(HC) -cpp $(INPLACE_EXTRA_FLAGS) $(INPLACE_SRC) -o $@
 
 all :: $(INPLACE_PROG)
 
@@ -866,8 +864,14 @@ GhcLibWays = $(GhcCompilerWays)
 # override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence
 GhcLibHcOpts =
 
+ifeq "$(DOING_BIN_DIST)" "YES"
+# This is derived from the sources when we are in a source tree, but we
+# don't have any sources in a bindist, so we have to shortcut it
+HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
+else
 # override default definition of HS_IFACES so we can add $(odir)
 HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
+endif
 
 # Haddock can't handle recursive modules currently, so we disable it for now.
 override HADDOCK_DOCS = NO
@@ -942,12 +946,6 @@ endif
 #-----------------------------------------------------------------------------
 # binary-dist
 
-ifeq "$(DOING_BIN_DIST)" "YES"
-# This is derived from the sources when we are in a source tree, but we
-# don't have any sources in a bindist, so we have to shortcut it
-HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
-endif
-
 binary-dist:
 	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/compiler
 	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/compiler/stage$(stage)