# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.35 2004/01/23 13:37:40 simonmar Exp $
+# $Id: package.mk,v 1.38 2004/03/27 09:57:58 panne Exp $
ifneq "$(PACKAGE)" ""
package.conf.inplace : package.conf.in
$(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \
- sed -e 's/""//g' -e 's/, ]/ ]/g' >$@
+ sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@
package.conf.installed : package.conf.in
$(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \
- sed -e 's/""//g' -e 's/, ]/ ]/g' >$@
+ 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
LIBRARY = libHS$(PACKAGE)$(_way).a
-WAYS = $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
all :: $(LIBRARY)
HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
HTML_DIR = html
-HTML_DOC = $(HTML_DIR)/haddock.css
+HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
ifneq "$(HS_PPS)" ""