# -----------------------------------------------------------------------------
-# $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)" ""
| 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
# 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