X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=ea2d3b2ab9446d538bc3985ee04cf36301bddade;hb=bbf41467d3466310431594516d88b1400aef245d;hp=b0841ba454c37f1b393b0cecdf0ce4848518ee16;hpb=6417028ace33946acad62b22c629d5fa62e19515;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index b0841ba..ea2d3b2 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,15 +1,10 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.52 2005/03/29 14:06:02 simonmar Exp $
+# $Id: package.mk,v 1.55 2005/05/13 10:05:33 krasimir Exp $
 
 ifneq "$(PACKAGE)" ""
 
-ifeq "$(STANDALONE_PACKAGE)" ""
-ifeq "$(ProjectNameShort)" "ghc"
+# FIXME: does anyone do this any more?
 STANDALONE_PACKAGE = NO
-else
-STANDALONE_PACKAGE = YES
-endif
-endif
 
 # -----------------------------------------------------------------------------
 # Directory layouts, installation etc.
@@ -86,7 +81,7 @@ package.conf.inplace   : package.conf.in
 		-DDATA_DIR='"$(DATA_DIR_INPLACE)"' \
 		-DHTML_DIR='"$(HTML_DIR_INPLACE)"' \
 		-DHADDOCK_IFACE='"$(HADDOCK_IFACE_INPLACE)"' \
-		-DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\" \
+		-DFPTOOLS_TOP_ABS='"${FPTOOLS_TOP_ABS}"' \
 		-x c $(PACKAGE_CPP_OPTS) $< | \
 	grep -v '^#pragma GCC' | \
 	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
@@ -104,7 +99,7 @@ package.conf.installed : package.conf.in
 	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$@
 
 # we could be more accurate here and add a dependency on
-# ghc/driver/package.conf, but that doesn't work too well because of
+# driver/package.conf, but that doesn't work too well because of
 # make's limited accuracy with modification times: when doing 'make
 # boot' in multiple packages, make won't detect that the package
 # configuration needs updating if it was updated already in the last
@@ -184,7 +179,9 @@ ifeq "$(NON_HS_PACKAGE)" ""
 SRC_HC_OPTS	+= -fgenerics
 endif
 
+ifndef LIBRARY
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
+endif
 
 ifeq "$(WAYS)" ""
 WAYS = $(GhcLibWays)
@@ -276,7 +273,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)
@@ -355,9 +354,9 @@ endif # $(LIBRARY) /= ""
 ifneq "$(PACKAGE)" ""
 ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
-HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
 
-HTML_DIR = html
+HTML_DIR = ../html/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""
@@ -398,11 +397,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