[project @ 2001-09-04 18:29:20 by ken]

[ghc-hetmet.git] / ghc / driver / Makefile

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index f6a555d..b0c4b63 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.61 2001/04/03 13:18:35 sewardj Exp $
+# $Id: Makefile,v 1.68 2001/08/04 06:09:24 ken Exp $
 #
 
 TOP=..
@@ -20,14 +20,12 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)"          \
               "$(CURRENT_DIR)"                 \
               "$(HaveLibGmp)"                  \
               "$(LibsReadline)"                \
-              "$(libdir)"                      \
               "$(GHC_LIB_DIR)"                 \
               "$(GHC_RUNTIME_DIR)"             \
               "$(GHC_UTILS_DIR)"               \
-              "$(GHC_INCLUDE_DIR)"             \
-              "$(FPTOOLS_TOP_ABS)"
+              "$(GHC_INCLUDE_DIR)"
 
-ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
+ghc_407_at_least = $(shell expr "$(GhcVersion)" \>= 4.07)
 ifeq "$(ghc_407_at_least)" "1"
 ifneq "$(mingw32_TARGET_OS)" "1"
 SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
@@ -39,6 +37,7 @@ SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
 endif
 
 SRC_HC_OPTS += -DWANT_PRETTY
+SRC_HC_OPTS += $(filter -D% -U%,$(GhcRtsCcOpts))
 
 all :: package.conf package.conf.inplace
 
@@ -56,11 +55,7 @@ Package.o : ../utils/ghc-pkg/Package.hs
 override datadir = $(libdir)
 INSTALL_DATAS += package.conf ghc-usage.txt
 
-ifeq "$(BIN_DIST)" "1"
-INSTALL_PROGS += pkgconf
-endif
-
-CLEAN_FILES += pkgconf package.conf.inplace package.conf
+CLEAN_FILES += Main.hi pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------