X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=d23f25489cdbe425fc120c2d320f4bd5b1e4cdb3;hb=e542d75c0a4b529aeafc0fc51038d670a8adc74c;hp=374bd53407429c168747f6e1d8db61a35e29834c;hpb=2e91abc1f5927bb7eb8b027549ecab5d54b6c48e;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 374bd53..d23f254 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -686,26 +686,11 @@ endif
 
 ifeq "$(Windows)" "YES"
 
-# directories don't work well as dependencies, hence a stamp file
-$(INPLACE)/stamp-mingw : $(MKDIRHIER)
-	$(MKDIRHIER) $(INPLACE_MINGW)/bin
-	GCC=`type -p $(WhatGccIsCalled)`; \
-	GccDir=`dirname $$GCC`; \
-	"$(CP)" -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \
-	"$(CP)" -Rp $$GccDir/../include $(INPLACE_MINGW); \
-	"$(CP)" -Rp $$GccDir/../lib     $(INPLACE_MINGW); \
-	"$(CP)" -Rp $$GccDir/../libexec $(INPLACE_MINGW); \
-	"$(CP)" -Rp $$GccDir/../mingw32 $(INPLACE_MINGW)
-	touch $(INPLACE)/stamp-mingw
-
 install : install_mingw
 .PHONY: install_mingw
 install_mingw : $(INPLACE_MINGW)
 	"$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
 
-$(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll :
-	"$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB)
-
 endif # Windows
 
 libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \
@@ -758,16 +743,24 @@ install_libs: $(INSTALL_LIBS)
 	done
 
 install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
+ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
+	@:
+else
 	$(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
 	for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
 		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
 	done
+endif
 
 install_libexecs:  $(INSTALL_LIBEXECS)
+ifeq "$(INSTALL_LIBEXECS)" ""
+	@:
+else
 	$(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
 	for i in $(INSTALL_LIBEXECS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
 	done
+endif
 
 install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
 	$(INSTALL_DIR) $(DESTDIR)$(topdir)
@@ -789,18 +782,24 @@ install_headers: $(INSTALL_HEADERS)
 
 install_docs: $(INSTALL_HEADERS)
 	$(INSTALL_DIR) $(DESTDIR)$(docdir)
+ifneq "$(INSTALL_DOCS)" ""
 	for i in $(INSTALL_DOCS); do \
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
 	done
-	$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \
-	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \
+endif
+	$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html
+	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html
+ifneq "$(INSTALL_LIBRARY_DOCS)" ""
 	for i in $(INSTALL_LIBRARY_DOCS); do \
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \
 	done
+endif
+ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
 		$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \
 	done
+endif
 
 INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
 
@@ -817,6 +816,21 @@ endif
 INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
 HIDDEN_PACKAGES = binary
 
+define set_INSTALL_DISTDIR
+# $1 = libraries/base, $2 = dist-install
+# =>
+# INSTALL_DISTDIR_libraries/base = dist-install
+INSTALL_DISTDIR_$1 = $2
+endef
+
+$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
+$(call set_INSTALL_DISTDIR,libraries/$p,dist-install)))
+INSTALL_DISTDIR_compiler = stage2
+
+ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \
+                         compiler \
+                         $(addprefix libraries/,$(PACKAGES_STAGE2))
+
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
 	$(INSTALL_DIR) $(DESTDIR)$(topdir)
@@ -824,24 +838,17 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	$(INSTALL_DIR) $(INSTALLED_PACKAGE_CONF)
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install
-	$(foreach p, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
+	$(foreach p, $(ALL_INSTALLED_PACKAGES),\
 	    "$(GHC_CABAL_INPLACE)" install \
 		 $(INSTALLED_GHC_REAL) \
 		 $(INSTALLED_GHC_PKG_REAL) \
 		 $(DESTDIR)$(topdir) \
-		 libraries/$p dist-install \
+		 $p $(INSTALL_DISTDIR_$p) \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
 		 $(RelocatableBuild) &&) true
 	$(foreach p, $(HIDDEN_PACKAGES),\
 	    $(INSTALLED_GHC_PKG_REAL) --global-conf $(INSTALLED_PACKAGE_CONF) \
 	                              hide $p &&) true
-	"$(GHC_CABAL_INPLACE)" install \
-		 $(INSTALLED_GHC_REAL) \
-	 	 $(INSTALLED_GHC_PKG_REAL) \
-		 $(DESTDIR)$(topdir) \
-		 compiler stage2 \
-		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
-		 $(RelocatableBuild)
 
 # -----------------------------------------------------------------------------
 # Binary distributions
@@ -915,7 +922,11 @@ windows-binary-dist-prep:
 	cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
+ifeq "$(ISCC)" ""
+	@echo No ISCC, so not making installer
+else
 	"$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+endif
 
 nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
 
@@ -973,17 +984,13 @@ VERSION :
 sdist : VERSION
 
 # Use:
-#     $(call sdist_file,compiler,stage2,cmm,CmmLex,x)
-# to copy the generated file that replaces compiler/cmm/CmmLex.x, where
+#     $(call sdist_file,compiler,stage2,cmm,Foo/Bar,CmmLex,x)
+# to copy the generated file that replaces compiler/cmm/Foo/Bar/CmmLex.x, where
 # "stage2" is the dist dir.
-sdist_file = \
-  if test -f $(TOP)/$1/$2/build/$4.hs; then \
-    "$(CP)" $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \
-    mv $1/$3/$4.$5 $1/$3/$4.$5.source ;\
-  else \
-    echo "does not exist: $1/$2/build/$4.hs"; \
-    exit 1; \
-  fi
+define sdist_file
+	"$(CP)" $1/$2/build/$4/$5.hs $(SRC_DIST_DIR)/$1/$3/$4
+	mv $(SRC_DIST_DIR)/$1/$3/$4/$5.$6 $(SRC_DIST_DIR)/$1/$3/$4/$5.$6.source
+endef
 
 .PHONY: sdist-prep
 sdist-prep :
@@ -995,15 +1002,16 @@ sdist-prep :
 	cd $(SRC_DIST_DIR) && $(MAKE) distclean
 	rm -rf $(SRC_DIST_DIR)/libraries/tarballs/
 	rm -rf $(SRC_DIST_DIR)/libraries/stamp/
-	cd $(SRC_DIST_DIR) && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then "$(CP)" $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmLex,x)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmParse,y)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Lexer,x)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Parser,y.pp)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,ParserCore,y)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/hpc,dist,,HpcParser,y)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Parser,y)
+	$(call sdist_file,compiler,stage2,cmm,,CmmLex,x)
+	$(call sdist_file,compiler,stage2,cmm,,CmmParse,y)
+	$(call sdist_file,compiler,stage2,parser,,Lexer,x)
+	$(call sdist_file,compiler,stage2,parser,,Parser,y.pp)
+	$(call sdist_file,compiler,stage2,parser,,ParserCore,y)
+	$(call sdist_file,utils/hpc,dist,,,HpcParser,y)
+	$(call sdist_file,utils/genprimopcode,dist,,,Lexer,x)
+	$(call sdist_file,utils/genprimopcode,dist,,,Parser,y)
+	$(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Lex,x)
+	$(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Parse,y)
 	cd $(SRC_DIST_DIR) && "$(RM)" $(RM_OPTS) -r compiler/stage[123] mk/build.mk
 	cd $(SRC_DIST_DIR) && "$(FIND)" $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r