projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-12-05 23:49:43 by mthomas]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
320c22a
..
9b02258
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.17 2002/07/23 11:23:55 simonmar Exp $
+# $Id: package.mk,v 1.19 2002/09/26 09:07:50 simonmar Exp $
ifneq "$(PACKAGE)" ""
ifneq "$(PACKAGE)" ""
@@
-23,7
+23,11
@@
$(PACKAGE).conf.installed : $(PACKAGE).conf.in
# configuration needs updating if it was updated already in the last
# second.
#
# configuration needs updating if it was updated already in the last
# second.
#
-STAMP_PKG_CONF = stamp-pkg-conf
+# The stamp file goes in $(GHC_DRIVER_DIR), so that if someone happens
+# to 'make clean' in ghc without cleaning in libraries too, the packages
+# will be correctly re-installed.
+#
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
CLEAN_FILES += $(STAMP_PKG_CONF)
boot all :: $(STAMP_PKG_CONF)
CLEAN_FILES += $(STAMP_PKG_CONF)
boot all :: $(STAMP_PKG_CONF)
@@
-156,6
+160,14
@@
HTML_DIR = html
HTML_DOC = $(HTML_DIR)/index.html
ifneq "$(HS_PPS)" ""
HTML_DOC = $(HTML_DIR)/index.html
ifneq "$(HS_PPS)" ""
+
+ifeq "$(HADDOCK)" ""
+html ::
+ @echo Haddock must be installed in order to build HTML library documentation.
+ @echo Please install Haddock and re-configure.
+ @exit 1
+endif
+
html :: $(HTML_DOC)
$(HTML_DOC) : $(HS_PPS)
html :: $(HTML_DOC)
$(HTML_DOC) : $(HS_PPS)