X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fpackage.mk;h=7e2cd0af09b4894b575ffd1c50ea92cfd36ec003;hb=5feee2442591409f5413cd4a2e4074d434657e85;hp=b0841ba454c37f1b393b0cecdf0ce4848518ee16;hpb=4c46b43215295868b332c40ba0d63520e6433536;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index b0841ba..7e2cd0a 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.52 2005/03/29 14:06:02 simonmar Exp $
+# $Id: package.mk,v 1.53 2005/04/15 18:13:34 sof Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -184,7 +184,9 @@ ifeq "$(NON_HS_PACKAGE)" ""
 SRC_HC_OPTS	+= -fgenerics
 endif
 
+ifndef LIBRARY
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
+endif
 
 ifeq "$(WAYS)" ""
 WAYS = $(GhcLibWays)
@@ -276,7 +278,9 @@ ifneq "$(LIBRARY)" ""
 ifeq "$(way)" ""
 ifeq "$(GhcWithInterpreter)" "YES"
 
+ifndef GHCI_LIBRARY
 GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
+endif
 
 ifneq "$(NO_INSTALL_LIBRARY)" "YES"
 INSTALL_LIBS += $(GHCI_LIBRARY)