X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=a2794ab081d6669152aea7ab529848c55390b700;hb=d19f868a2fbfb583e57d9c47b97c0cdb3a95ae57;hp=098e189a648773e77644565a2c3581075955246e;hpb=bc28236ad12eb65994b68c690a5069b7e0257c61;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 098e189..a2794ab 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.55 2005/05/13 10:05:33 krasimir Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -154,14 +154,24 @@ endif # $(way) == ""
 # -----------------------------------------------------------------------------
 # Building the static library libHS<pkg>.a
 
+SRC_HSC2HS_OPTS += -I.
+
 ifeq "$(STANDALONE_PACKAGE)" "NO"
 HC = $(GHC_INPLACE)
-endif
-
-SRC_HSC2HS_OPTS += -I.
+IGNORE_PACKAGE_FLAG = -ignore-package
+else
+# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
+# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
+ifeq "$(strip $(GHC))" ""
+IGNORE_PACKAGE_FLAG = -ignore-package
+else
+# Making the assumption here that standalone packages will be using mk/config.mk:GHC
+IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi)
+endif 
+endif # STANDALONE_PACKAGE
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS 	+= -ignore-package $(PACKAGE)
+SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG) $(PACKAGE)
 SRC_HC_OPTS 	+= $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif
@@ -174,7 +184,9 @@ ifeq "$(NON_HS_PACKAGE)" ""
 SRC_HC_OPTS	+= -fgenerics
 endif
 
+ifndef LIBRARY
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
+endif
 
 ifeq "$(WAYS)" ""
 WAYS = $(GhcLibWays)
@@ -228,9 +240,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 +256,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)
@@ -262,9 +278,11 @@ ifneq "$(LIBRARY)" ""
 ifeq "$(way)" ""
 ifeq "$(GhcWithInterpreter)" "YES"
 
+ifndef GHCI_LIBRARY
 GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
+endif
 
-ifneq "$(PACKAGE)" ""
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
 INSTALL_LIBS += $(GHCI_LIBRARY)
 endif
 
@@ -323,7 +341,7 @@ $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
 	$(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
 endif
 
-ifneq "$(PACKAGE)" ""
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
 INSTALL_LIBS += $(DYLD_LIBRARY)
 endif
 
@@ -343,7 +361,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
-HTML_DIR = html
+HTML_DIR = ../html/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""
@@ -384,11 +402,11 @@ HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
 
 install-docs :: $(HTML_DOC)
 	@$(INSTALL_DIR) $(HTML_INSTALL_DIR)
-	@for i in $(HTML_DIR)/*; do \
-	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
-	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
-	done
-	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR)
+	for i in $(HTML_DIR)/*; do \
+	  echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
+	  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
+	done; \
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR); \
 
 endif # HS_PPS
 endif # NO_HADDOCK_DOCS