projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve documentation of stolen syntax
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
f17f9e0
..
ef20386
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-84,7
+84,7
@@
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
+ | $(DESTDIR)$(bindir)/ghc-pkg --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
# 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
+120,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)