update for new source tree layout (untested)

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index 552741d..ea2d3b2 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,15 +1,10 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.54 2005/04/29 13:09:28 krasimir 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
@@ -359,7 +354,7 @@ 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/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
@@ -402,15 +397,11 @@ HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
 
 install-docs :: $(HTML_DOC)
        @$(INSTALL_DIR) $(HTML_INSTALL_DIR)
-       @for i in $(XMLDocWays); do \
-               if [ $$i = "html" ]; then \
-                  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); \
-               fi \
-       done
+       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