X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=d77eb33d7edc54347780da19b31b4f3897bd9801;hb=2b811329caa54eee7c1b159384e1e1aa3a5e9feb;hp=098e189a648773e77644565a2c3581075955246e;hpb=bc28236ad12eb65994b68c690a5069b7e0257c61;p=ghc-hetmet.git diff --git a/mk/package.mk b/mk/package.mk index 098e189..d77eb33 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.47 2005/02/09 10:11:36 simonmar Exp $ +# $Id: package.mk,v 1.49 2005/03/03 21:01:49 wolfgang Exp $ ifneq "$(PACKAGE)" "" @@ -228,9 +228,6 @@ else INSTALL_IFACES += $(HS_IFACES) endif -# install library (could be implicitly specified or explicitly, like libHS*_cbits.a) -INSTALL_LIBS += $(LIBRARY) - # ----------------------------------------------------------------------------- # Dependencies @@ -247,6 +244,13 @@ endif endif # $(PACKAGE) != "" #-------------------------------------------------------------- +# Installation + +ifneq "$(NO_INSTALL_LIBRARY)" "YES" +INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY) +endif + +#-------------------------------------------------------------- # Building dynamically-linkable libraries for GHCi # # Build $(GHCI_LIBRARY) whenever we build $(LIBRARY) @@ -264,7 +268,7 @@ ifeq "$(GhcWithInterpreter)" "YES" GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY)) -ifneq "$(PACKAGE)" "" +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(GHCI_LIBRARY) endif @@ -323,7 +327,7 @@ $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) $(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS) endif -ifneq "$(PACKAGE)" "" +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(DYLD_LIBRARY) endif