# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.6 2002/02/17 13:46:39 panne Exp $
+# $Id: package.mk,v 1.9 2002/02/22 22:20:25 panne Exp $
ifneq "$(PACKAGE)" ""
| sed 's/^#.*$$//g' >$@
$(PACKAGE).conf.installed : $(PACKAGE).conf.in
- $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLED -x c $(PACKAGE_CPP_OPTS) $< \
+ $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
# -----------------------------------------------------------------------------
# Installation; need to install .hi files as well as libraries
-INSTALL_LIBS += $(LIBRARY)
-
ifeq "$(DLLized)" "YES"
INSTALL_PROGS += $(DLL_NAME)
INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
endif # $(PACKAGE) /= ""
+# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
+INSTALL_LIBS += $(LIBRARY)
+
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
#
# when we can use a "fixed" ld.
#
$(GHCI_LIBRARY) : $(LIBOBJS)
- $(LD) -r $(LD_X) -o $@ $(LIBOBJS)
+ $(LD) -r $(LD_X) -o $@ $(STUBOBJS) $(LIBOBJS)
endif # DONT_WANT_STD_GHCI_LIB_RULE
endif # GhcWithInterpreter