X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=9e1026e00a6f40e7db533097b2c822159c8843ce;hb=9aad47f1162666431deee99884c523b1ff69cf98;hp=cb000649384c0430c099c0a3a5ee6fdc8e66cbeb;hpb=eb4427afd02f653087fa3d2720193b625b6411ee;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index cb00064..9e1026e 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: \
@@ -797,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