X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2Fghc.mk;h=68055b564eaf4bbf30b4b348cf4eb75e14d458bc;hb=a278f3f02d09bc32b0a75d4a04d710090cde250f;hp=007ce4bb5d7570438fa4dea25eb2f5938411293f;hpb=05ca104ec33806ed3830eaa3963701e03dfd0d43;p=ghc-hetmet.git

diff --git a/includes/ghc.mk b/includes/ghc.mk
index 007ce4b..68055b5 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -46,7 +46,7 @@ endif
 
 ifneq "$(BINDIST)" "YES"
 
-ifneq "$(TARGETPLATFORM)"  "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 $(includes_H_CONFIG) :
 	@echo "*** Cross-compiling: please copy $(includes_H_CONFIG) from the target system"
@@ -116,7 +116,7 @@ endif
 
 includes_DERIVEDCONSTANTS = includes/DerivedConstants.h
 
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 DerivedConstants.h :
 	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@ -129,7 +129,7 @@ includes_dist-derivedconstants_PROG   = mkDerivedConstants$(exeext)
 
 $(eval $(call build-prog,includes,dist-derivedconstants,0))
 
-$(includes_dist-derivedconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
 includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
 
 ifneq "$(BINDIST)" "YES"
@@ -144,7 +144,7 @@ endif
 
 includes_GHCCONSTANTS = includes/GHCConstants.h
 
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 $(includes_GHCCONSTANTS) :
 	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@ -159,7 +159,7 @@ includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
 $(eval $(call build-prog,includes,dist-ghcconstants,0))
 
 ifneq "$(BINDIST)" "YES"
-$(includes_dist-ghcconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
 
 includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
 
@@ -186,10 +186,10 @@ install: install_includes
 
 .PHONY: install_includes
 install_includes :
-	$(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
 	for d in $(includes_subdirs); do \
-		$(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir)/$$d; \
+		$(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)/$$d"; \
 	done
 	for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \
-		$(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i $(DESTDIR)$(ghcheaderdir)/$$i; \
+		$(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i "$(DESTDIR)$(ghcheaderdir)/$$i"; \
 	done