summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2007-07-14 16:13:12 +0000
committerIan Lynagh <igloo@earth.li>2007-07-14 16:13:12 +0000
commitd9dc5b442d05fb1f05e6846c3f3413b6168758f5 (patch)
tree9676ddd3a354e14e7cfea41241e6549d5676a1df /Makefile
parent84d072eaeeeb3decfc39a96c033b9fa2ec3baec5 (diff)
downloadhaskell-d9dc5b442d05fb1f05e6846c3f3413b6168758f5.tar.gz
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a2337f007d..a7ae8f4174 100644
--- a/Makefile
+++ b/Makefile
@@ -225,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
@@ -293,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