X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=4d71792ff608b2ce53a5b60d697c206708152481;hb=9c7f3c9fbe8bd63c8802a87ef8ac0285434dc807;hp=f9c691c28136aaf7ae4c712abee9e78d9dc3a4f6;hpb=7a98ee19927e0bce69fd0141eb9d714577b7d0da;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index f9c691c..4d71792 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.10 2000/01/31 15:12:07 simonmar Exp $
+# $Id: Makefile,v 1.21 2002/07/02 14:15:22 simonmar Exp $
 #
 
 TOP=.
@@ -14,21 +14,21 @@ include $(TOP)/mk/boilerplate.mk
 #
 
 #
-# Order is important! driver/ has to come before includes/ which
-# again has to come before the rest.
+# Order is important! It's e.g. necessary to descend into include/
+# 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 compiler/ and lib/.
 #
-ifeq "$(GhcWithHscBuiltViaC)" "NO"
-SUBDIRS = utils driver includes rts docs compiler lib
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS = includes utils rts docs compiler driver
 else
-SUBDIRS = utils driver includes rts docs lib compiler
+ifneq "$(ILXized)" "YES"
+SUBDIRS = includes utils driver docs compiler rts
+else
+# No RTS for ILX
+SUBDIRS = includes utils driver docs compiler
 endif
-
-# Easier to copy
-ifeq "$(BIN_DIST)" "1"
-SUBDIRS := $(filter-out docs,$(SUBDIRS))
 endif
 
 ifeq ($(IncludeTestDirsInBuild),YES)
@@ -37,4 +37,13 @@ endif
 
 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