[project @ 2002-03-25 05:25:27 by sof]

[haskell-directory.git] / Makefile

diff --git a/Makefile b/Makefile
index fce13a5..3124d4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.20 2002/03/05 14:31:47 simonmar Exp $
+# $Id: Makefile,v 1.21 2002/03/25 05:25:27 sof Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -75,15 +75,10 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
-DONT_WANT_BASE_GHCI_LIB_RULE=YES
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-HSbase.o : $(GHCI_LIBOBJS)
-       $(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-       $(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
-       @touch HSbase.o
-
 INSTALL_LIBS += HSbase1.o HSbase2.o
 
 endif # TARGETPLATFORM = i386-unknown-mingw32
@@ -92,4 +87,9 @@ endif # TARGETPLATFORM = i386-unknown-mingw32
 # -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
+HSbase.o : $(GHCI_LIBOBJS)
+       $(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
+       $(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
+       @touch HSbase.o
+