Fix putting hsicon.ico into the Windows installer; fixes #1515

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index b8c1089..a7ae8f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,15 +59,12 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
 endif
 
-# Needed for, e.g., clean
-SUBDIRS = $(SUBDIRS_BUILD)
-
-SUBDIRS_INSTALL = includes compat utils driver docs rts libraries compiler
+SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 
 # Sanity check that all the core libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -140,7 +137,7 @@ endif
 install :: check-packages
        $(INSTALL_DIR) $(bindir)
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(SUBDIRS_INSTALL); do \
+       for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) $@ $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -182,7 +179,7 @@ endif
 
 install-docs ::
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(SUBDIRS_INSTALL); do \
+       for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) $@ $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -228,6 +225,10 @@ binary-dist::
 binary-dist::
        cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 
+binary-dist::
+       $(MKDIRHIER) $(BIN_DIST_DIR)/icons
+       cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
+
 else
 
 BinDistDirs = includes compiler docs rts
@@ -264,6 +265,7 @@ binary-dist-pre::
        $(MKDIRHIER) $(BIN_DIST_DIR)/share
 
 binary-dist::
+       $(MAKE) -C gmp      binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C includes binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C compiler binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
        # XXX $(MAKE) -C docs     binary-dist DOING_BIN_DIST=YES
@@ -295,12 +297,6 @@ binary-dist::
        $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
        ( cd $(BIN_DIST_DIR); autoreconf )
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist::
-       $(MKDIRHIER) $(BIN_DIST_DIR)/icons
-       cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
-endif
-
 #
 # binary dist'ing the documentation.  
 # The default documentation to build/install is given below; overrideable
@@ -435,7 +431,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS_INSTALL))
+SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
        aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \