diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-14 01:08:48 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-14 01:08:48 +0100 |
| commit | ff1a16a0bd630f97dc507f96977eaaae9d8df9a6 (patch) | |
| tree | 1396eed617fa2f380c7b2139cdf89f80fb2b9bbb /ghc.mk | |
| parent | b8447a93b36d19f4c1dd81881ff10adf8c781fbe (diff) | |
| download | haskell-ff1a16a0bd630f97dc507f96977eaaae9d8df9a6.tar.gz | |
Simplify ghc-cabal
It now consistently takes directory and distDirectory as its first 2
arguments. Also, it only supports configuring 1 package at a time now
(we weren't using the ability to configure more than one at once).
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -893,8 +893,8 @@ install_packages: rts/package.conf.install $(foreach p, $(INSTALL_PACKAGES), \ $(call make-command, \ "$(ghc-cabal_INPLACE)" copy \ - "$(STRIP_CMD)" \ $p $(INSTALL_DISTDIR_$p) \ + "$(STRIP_CMD)" \ '$(DESTDIR)' \ '$(prefix)' \ '$(ghclibdir)' \ @@ -903,10 +903,10 @@ install_packages: rts/package.conf.install $(foreach p, $(INSTALL_PACKAGES), \ $(call make-command, \ "$(ghc-cabal_INPLACE)" register \ + $p $(INSTALL_DISTDIR_$p) \ "$(INSTALLED_GHC_REAL)" \ "$(INSTALLED_GHC_PKG_REAL)" \ "$(DESTDIR)$(topdir)" \ - $p $(INSTALL_DISTDIR_$p) \ '$(DESTDIR)' \ '$(prefix)' \ '$(ghclibdir)' \ |