X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2FMakefile;h=ee14beb43d83ed72e5773b0f614dd7ac4d45a5f2;hb=affe92132329afa642bc83d74d5b07d14187e968;hp=201732727e94d13554cb198e8eb4e441dcd9e90d;hpb=887cb4ffe7b9936d3708f9a9f84ad4a346f9eb75;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 2017327..ee14beb 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.18 2001/07/13 13:55:19 rrt Exp $
+# $Id: Makefile,v 1.22 2003/03/31 12:23:41 simonmar Exp $
 #
 
 TOP=.
@@ -18,24 +18,19 @@ include $(TOP)/mk/boilerplate.mk
 # before the rest to have a config.h, etc.
 #
 # If we're booting from .hc files, swap the order
-# we descend into compiler/ and lib/.
+# we descend into subdirs - to boot utils must be before driver.
 #
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes utils rts docs lib compiler driver
+SUBDIRS = includes rts docs compiler utils driver
 else
 ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver docs compiler rts lib
+SUBDIRS = includes utils driver docs compiler rts
 else
 # No RTS for ILX
-SUBDIRS = includes utils driver docs compiler lib
+SUBDIRS = includes utils driver docs compiler
 endif
 endif
 
-# Easier to copy
-ifeq "$(BIN_DIST)" "1"
-SUBDIRS := $(filter-out docs,$(SUBDIRS))
-endif
-
 ifeq ($(IncludeTestDirsInBuild),YES)
 SUBDIRS += tests
 endif
@@ -44,4 +39,11 @@ SRC_DIST_FILES += configure
 
 DIST_CLEAN_FILES += ghc.spec config.status
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# These files need to be in the InstallShield
+# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
+# in the top-level directory of the distribution
+INSTALL_DATAS += ANNOUNCE LICENSE README VERSION
+endif
+
 include $(TOP)/mk/target.mk