[project @ 2002-02-13 15:07:59 by simonmar]

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index da8712f..7a628f9 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.1 2002/02/12 15:17:35 simonmar Exp $
+# $Id: package.mk,v 1.3 2002/02/13 10:45:28 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -17,10 +17,8 @@ $(PACKAGE).conf.installed : $(PACKAGE).conf.in
                | sed 's/^#.*$$//g' >$@
 
 boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
-       -$(GHC_PKG_INPLACE) --remove-package $(PACKAGE)
-       $(GHC_PKG_INPLACE) --add-package <$(PACKAGE).conf.inplace
-       -$(GHC_PKG_INPLACE) -f $(GHC_DRIVER_DIR)/package.conf --remove-package $(PACKAGE)
-       $(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --add-package <$(PACKAGE).conf.installed
+       $(GHC_PKG_INPLACE) --update-package <$(PACKAGE).conf.inplace
+       $(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --update-package <$(PACKAGE).conf.installed
 
 CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
 
@@ -93,8 +91,8 @@ ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
 # hslibs/Win32 uses this 'feature', which will go away soon
 # when we can use a "fixed" ld.
 #
-$(GHCI_LIBRARY) : $(OBJS)
-       $(LD) -r $(LD_X) -o $@ $(OBJS)
+$(GHCI_LIBRARY) : $(LIBOBJS)
+       $(LD) -r $(LD_X) -o $@ $(LIBOBJS)
 
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter