X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=f5d0d9d7d6d5242239a184819dc8db6bf5f40c51;hb=e6fb8c9e66351ea240a3b4eb36c40e4c42b91da5;hp=471fb4f00c1f335f4d9ab49c4c4aee172359daac;hpb=142df90ad9ec1155129a01949775bf992c75f08f;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 471fb4f..f5d0d9d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -486,12 +486,12 @@ BUILD_DIRS =
 
 ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += \
-   $(GHC_MKDEPENDC_DIR) \
    $(GHC_MKDIRHIER_DIR)
 endif
 
 BUILD_DIRS += \
    docs/users_guide \
+   docs/man \
    libraries/Cabal/doc \
    $(GHC_UNLIT_DIR) \
    $(GHC_HP2PS_DIR)
@@ -681,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
@@ -716,6 +716,11 @@ install : install_mingw
 install_mingw : $(INPLACE_MINGW)
 	"$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
 
+install : install_perl
+.PHONY: install_perl
+install_perl : $(INPLACE_PERL)
+	"$(CP)" -Rp $(INPLACE_PERL) $(prefix)
+
 endif # Windows
 
 ifneq "$(BINDIST)" "YES"
@@ -745,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)
@@ -762,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; \
@@ -915,6 +916,7 @@ $(eval $(call bindist,.,\
     $(INSTALL_TOPDIRS) \
     $(INSTALL_TOPDIR_SCRIPTS) \
     $(INSTALL_BINS) \
+    $(INSTALL_MANPAGES) \
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
@@ -923,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 \
@@ -946,6 +947,7 @@ unix-binary-dist-prep:
 	echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
 	echo "BUILD_DOCBOOK_PS   = $(BUILD_DOCBOOK_PS)"   >> $(BIN_DIST_MK)
 	echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
+	echo "BUILD_MAN          = $(BUILD_MAN)"          >> $(BIN_DIST_MK)
 	ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac
 	cd $(BIN_DIST_PREP_DIR) && autoreconf
 	"$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
@@ -1078,6 +1080,15 @@ SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR)
 endif
 
 # -----------------------------------------------------------------------------
+# sdisting libraries
+
+# Use manually, with e.g.:
+#     make sdist_directory
+
+sdist_%:
+	inplace/bin/ghc-cabal sdist libraries/$* dist-install
+
+# -----------------------------------------------------------------------------
 # Cleaning
 
 .PHONY: clean