X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=1e66ebfe9e5a46cca5b8be5d8699e53f8e1b1cc1;hb=74cda6e5e3acef102eb5c176e4c6edca7a74198b;hp=706136b340ebafef64cf23711528891542a5c2c3;hpb=abd0df2e11c3ba15a141de16f1d982c63113a3fe;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 706136b..1e66ebf 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -83,7 +83,7 @@
 
 # We need second expansion for the way we handle directories, so that
 #     | $$$$(dir $$$$@)/.
-# expands to the directoy of a rule that uses a % pattern.
+# expands to the directory of a rule that uses a % pattern.
 .SECONDEXPANSION:
 
 default : all
@@ -486,7 +486,6 @@ BUILD_DIRS =
 
 ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += \
-   $(GHC_MKDEPENDC_DIR) \
    $(GHC_MKDIRHIER_DIR)
 endif
 
@@ -682,8 +681,8 @@ compiler/stage1/package-data.mk : \
 
 # These are necessary because the bootstrapping compiler may not know
 # about cross-package dependencies:
-$(compiler_stage1_depfile) : $(BOOT_LIBS)
-$(ghc_stage1_depfile) : $(compiler_stage1_v_LIB)
+$(compiler_stage1_depfile_haskell) : $(BOOT_LIBS)
+$(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB)
 
 # A few careful dependencies between bootstrapping packages.  When we
 # can rely on the stage 0 compiler being able to generate
@@ -751,9 +750,6 @@ install_bins: $(INSTALL_BINS)
 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 	for i in $(INSTALL_BINS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ;  \
-                if test "$(darwin_TARGET_OS)" = "1"; then \
-                   sh mk/fix_install_names.sh $(ghclibdir) "$(DESTDIR)$(bindir)/$$i" ; \
-                fi ; \
 	done
 
 install_libs: $(INSTALL_LIBS)
@@ -768,8 +764,7 @@ install_libs: $(INSTALL_LIBS)
 		  *.so) \
 		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \
 		  *.dylib) \
-		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
-		    install_name_tool -id "$(DESTDIR)$(ghclibdir)/`basename $$i`" "$(DESTDIR)$(ghclibdir)/`basename $$i`" ;; \
+		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \
 		  *) \
 		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
 		esac; \
@@ -930,7 +925,6 @@ $(eval $(call bindist,.,\
 	$(wildcard libraries/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \
-	mk/fix_install_names.sh \
 	mk/project.mk \
 	mk/install.mk.in \
 	bindist.mk \