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

It was done in a bit of the Makefile that was if'ed out for Windows.

diff --git a/Makefile b/Makefile
index a2337f0..a7ae8f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -225,6 +225,10 @@ binary-dist::
 binary-dist::
        cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 
 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
 else
 
 BinDistDirs = includes compiler docs rts

@@ -293,12 +297,6 @@ binary-dist::
        $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
        ( cd $(BIN_DIST_DIR); autoreconf )
 
        $(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
 #
 # binary dist'ing the documentation.  
 # The default documentation to build/install is given below; overrideable