From: simonmar <unknown>
Date: Thu, 10 Feb 2005 13:38:35 +0000 (+0000)
Subject: [project @ 2005-02-10 13:38:35 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1087
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=394394f9f78d5a078f14ca289d1c9fbb43dd7159;hp=e7c3f957fd36fd9f6369183b7a31e2a4a4c21b43

[project @ 2005-02-10 13:38:35 by simonmar]
Fix library installation: we now install libraries *unless*
NO_INSTALL_LIBRARY=YES.
---

diff --git a/mk/package.mk b/mk/package.mk
index 098e189..7397e63 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.48 2005/02/10 13:38:35 simonmar 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