[project @ 2001-03-23 16:36:20 by simonmar]

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

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index c9d19f6..5066d64 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.51 2001/02/11 16:32:48 simonmar Exp $
+# $Id: Makefile,v 1.56 2001/03/19 18:15:59 sewardj Exp $
 #
 
 TOP=..
@@ -9,21 +9,6 @@ include $(TOP)/mk/boilerplate.mk
 # hack for ghci-inplace script, see below
 INSTALLING=1
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(GHC_INPLACE)
-endif
-
-ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
-ifeq "$(ghc_407_at_least)" "1"
-ifneq "$(mingw32_TARGET_OS)" "1"
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
-else
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package text
-endif
-else
-SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
-endif
-
 ifeq "$(INSTALLING)" "1"       
 SUBDIRS = mangler split
 endif
@@ -56,6 +41,19 @@ CLEAN_FILES += $(CONFIG_HS)
 # -----------------------------------------------------------------------------
 # package configuration files...
 
+ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
+ifeq "$(ghc_407_at_least)" "1"
+ifneq "$(mingw32_TARGET_OS)" "1"
+SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
+else
+SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package text
+endif
+else
+SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
+endif
+
+SRC_HC_OPTS += -DWANT_PRETTY
+
 all :: package.conf package.conf.inplace
 
 pkgconf : Config.o Package.o PackageSrc.o Utils.o
@@ -67,6 +65,8 @@ package.conf.inplace : pkgconf
 package.conf : pkgconf
        ./pkgconf install >$@
 
+Package.o : ../utils/ghc-pkg/Package.hs
+
 INSTALL_DATAS += package.conf
 
 CLEAN_FILES += pkgconf package.conf.inplace package.conf
@@ -87,23 +87,20 @@ endif
 INSTALLED_SCRIPT_PROG  = ghci-$(ProjectVersion)
 INPLACE_SCRIPT_PROG    = ghci-inplace
 
+SCRIPT_OBJS      = ghci.sh
+INTERP           = $(SHELL)
+SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
+INSTALL_SCRIPTS  += $(SCRIPT_PROG) ghc5
+
 ifeq "$(INSTALLING)" "1"
-TOP_PWD        := $(prefix)
 SCRIPT_PROG    =  $(INSTALLED_SCRIPT_PROG)
-SCRIPT_LINK    =  ghci
+TOPDIROPT      =  
+LINK           =  ghci
 else
-TOP_PWD        := $(FPTOOLS_TOP_ABS)
+TOPDIROPT      =  -B$(FPTOOLS_TOP_ABS)
 SCRIPT_PROG    =  $(INPLACE_SCRIPT_PROG)
 endif
 
-SCRIPT_OBJS=ghci.sh
-
-INTERP=$(SHELL)
-
-SCRIPT_SUBST_VARS = GHCBIN
-
-INSTALL_SCRIPTS += $(SCRIPT_PROG)
-
 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"
@@ -117,6 +114,16 @@ endif
 override datadir=$(libdir)
 INSTALL_DATAS += ghc-usage.txt
 
+ghc5 :
+       rm -f ghc5
+       echo "#!/bin/sh" > ghc5
+       echo "# You (the user) need to set GHC_TOPDIR to make it work!" >> ghc5
+       echo "GHC_TOPDIR=/path/to/root/of/ghc/installation/tree" >> ghc5
+       echo "GHC_PLATFORM=$(TARGETPLATFORM)" >> ghc5
+       cat ghc5.sh >> ghc5
+
+
+
 # -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk