diff options
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | mk/cabal-flags.mk | 2 | ||||
| -rw-r--r-- | mk/cabal.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index d33435e450..4249ceec49 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -375,7 +375,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index 4144f255d2..d69999f9b0 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -2,6 +2,8 @@ nothing= space=$(nothing) $(nothing) +GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg + LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf diff --git a/mk/cabal.mk b/mk/cabal.mk index bdf8e9918f..efd75e20c9 100644 --- a/mk/cabal.mk +++ b/mk/cabal.mk @@ -44,7 +44,7 @@ with-stage-2: install: $(INSTALL_PACKAGE) install \ - '$(DESTDIR)$(bindir)/ghc-pkg' \ + '$(GHC_PKG_INSTALL_PROG)' \ '$(DESTDIR)$(datadir)/package.conf' \ '$(DESTDIR)' '$(prefix)' \ '$(prefix)' '$(bindir)' '$(libdir)' \ |