projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-09-20 17:53:40 by panne]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
a5eae09
..
e81e7ce
100644
(file)
--- 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)" ""
ifneq "$(PACKAGE)" ""
@@
-97,7
+97,9
@@
endif
LIBRARY = libHS$(PACKAGE)$(_way).a
LIBRARY = libHS$(PACKAGE)$(_way).a
-WAYS = $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
all :: $(LIBRARY)
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
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)" ""
ifneq "$(HS_PPS)" ""