X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2FMakefile;h=6005c1ead65bb7641ce18feb31f99827d83e4846;hp=1c8ec965e06c8bcad5a052d227eca0ccd77b0b6e;hb=272a418428beede04a9c4ae027474878c59d6ca1;hpb=c37f406cfd4c4e70519238e2c7b8321f213b7530

diff --git a/ghc/Makefile b/ghc/Makefile
index 1c8ec96..6005c1e 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.17 2001/04/27 03:11:25 qrczak Exp $
+# $Id: Makefile,v 1.23 2003/10/17 17:52:33 panne Exp $
 #
 
 TOP=.
@@ -18,17 +18,17 @@ 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
-SUBDIRS = includes utils driver docs compiler rts lib
+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,6 +37,16 @@ endif
 
 SRC_DIST_FILES += configure
 
-DIST_CLEAN_FILES += ghc.spec config.status
+DIST_CLEAN_FILES += config.cache config.status ghc.spec
+
+extraclean::
+	$(RM) -rf autom4te.cache
+
+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