From 529e082c015a9bed835b2a223296f0a658d44c8e Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 28 Aug 2008 19:15:12 +0000 Subject: [PATCH] Use the right ghc-pkg when installing the rts package --- mk/package.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/package.mk b/mk/package.mk index ef20386..1868ca0 100644 --- 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' \ - | $(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 -- 1.7.10.4