projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-05-16 10:14:20 by simonmar]
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
9b02258
..
d06a6c6
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.19 2002/09/26 09:07:50 simonmar Exp $
+# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $
ifneq "$(PACKAGE)" ""
ifneq "$(PACKAGE)" ""
@@
-30,7
+30,9
@@
$(PACKAGE).conf.installed : $(PACKAGE).conf.in
STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
CLEAN_FILES += $(STAMP_PKG_CONF)
STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
CLEAN_FILES += $(STAMP_PKG_CONF)
+ifneq "$(BootingFromHc)" "YES"
boot all :: $(STAMP_PKG_CONF)
boot all :: $(STAMP_PKG_CONF)
+endif
$(STAMP_PKG_CONF) : $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
$(GHC_PKG_INPLACE) --update-package <$(PACKAGE).conf.inplace
$(STAMP_PKG_CONF) : $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
$(GHC_PKG_INPLACE) --update-package <$(PACKAGE).conf.inplace
@@
-86,7
+88,11
@@
endif
# The interface files are put inside the $(libdir), since they
# might (potentially) be platform specific..
# The interface files are put inside the $(libdir), since they
# might (potentially) be platform specific..
-ifacedir = $(libdir)/imports/$(PACKAGE)
+ifeq "$(HIERARCHICAL_LIB)" "YES"
+ifacedir = $(libdir)/imports
+else
+ifacedir = $(libdir)/hslibs-imports/$(PACKAGE)
+endif
# If the lib consists of a hierachy of modules, we must retain the directory
# structure when we install the interfaces.
# If the lib consists of a hierachy of modules, we must retain the directory
# structure when we install the interfaces.
@@
-161,6
+167,8
@@
HTML_DOC = $(HTML_DIR)/index.html
ifneq "$(HS_PPS)" ""
ifneq "$(HS_PPS)" ""
+CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
+
ifeq "$(HADDOCK)" ""
html ::
@echo Haddock must be installed in order to build HTML library documentation.
ifeq "$(HADDOCK)" ""
html ::
@echo Haddock must be installed in order to build HTML library documentation.
@@
-170,6
+178,9
@@
endif
html :: $(HTML_DOC)
html :: $(HTML_DOC)
+extraclean ::
+ $(RM) -rf $(HTML_DIR)
+
$(HTML_DOC) : $(HS_PPS)
@$(INSTALL_DIR) $(HTML_DIR)
$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
$(HTML_DOC) : $(HS_PPS)
@$(INSTALL_DIR) $(HTML_DIR)
$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
@@
-189,6
+200,7
@@
install-docs :: $(HTML_DOC)
echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
done
echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
done
+ $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/$(PACKAGE)
endif # HS_PPS
endif # NO_HADDOCK_DOCS
endif # HS_PPS
endif # NO_HADDOCK_DOCS