projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #2573; and explanatory comment
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
f17f9e0
..
028600a
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-84,7
+84,9
@@
install::
-x c $(PACKAGE_CPP_OPTS) package.conf.in \
| grep -v '^#pragma GCC' \
| sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
-x c $(PACKAGE_CPP_OPTS) package.conf.in \
| grep -v '^#pragma GCC' \
| sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
- | $(GHC_PKG_PROG) --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
+ | $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
+
+GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
# we could be more accurate here and add a dependency on
# driver/package.conf, but that doesn't work too well because of
# we could be more accurate here and add a dependency on
# driver/package.conf, but that doesn't work too well because of
@@
-120,6
+122,7
@@
SRC_HSC2HS_OPTS += -I.
ifneq "$(NO_SET_HC)" "YES"
HC = $(GHC_INPLACE)
ifneq "$(NO_SET_HC)" "YES"
HC = $(GHC_INPLACE)
+BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =
endif
IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION)
endif
IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION)
@@
-267,13
+270,6
@@
ifneq "$(HS_PPS)" ""
CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
-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)
extraclean ::
html :: $(HTML_DOC)
extraclean ::