projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecb1350
)
Use the right ghc-pkg when installing the rts package
author
Ian Lynagh
<igloo@earth.li>
Thu, 28 Aug 2008 19:15:12 +0000
(19:15 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 28 Aug 2008 19:15:12 +0000
(19:15 +0000)
mk/package.mk
patch
|
blob
|
history
diff --git
a/mk/package.mk
b/mk/package.mk
index
ef20386
..
1868ca0
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' \
- | $(DESTDIR)$(bindir)/ghc-pkg --global-conf $(DESTDIR)$(datadir)/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