X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=e81e7cee9deb48445eeab0157b5ba75a6d91c85c;hb=25ab6038d53ae8dabf5cf3a469096f73ae25227d;hp=a5eae096aacc8c2f94e17cf9041b9c8a757b1fa9;hpb=6b44103a11f798e878a7061f8a4a3a8f59842329;p=ghc-hetmet.git diff --git a/mk/package.mk b/mk/package.mk index a5eae09..e81e7ce 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.36 2004/02/07 14:08:57 panne Exp $ +# $Id: package.mk,v 1.38 2004/03/27 09:57:58 panne Exp $ ifneq "$(PACKAGE)" "" @@ -97,7 +97,9 @@ endif LIBRARY = libHS$(PACKAGE)$(_way).a -WAYS = $(GhcLibWays) +ifeq "$(WAYS)" "" +WAYS = $(GhcLibWays) +endif all :: $(LIBRARY) @@ -209,7 +211,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES" 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)" ""