diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-28 18:24:47 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-28 18:24:47 +0000 |
| commit | ecb13508a1c09df7b87ba5260a30a2a23bdd46d0 (patch) | |
| tree | 33d32b84832d88269e3966d7ef237098a6f87e7a /libraries | |
| parent | 3ca47cbd5a24f01aca3420407aa22b84396d674d (diff) | |
| download | haskell-ecb13508a1c09df7b87ba5260a30a2a23bdd46d0.tar.gz | |
When installing, we can't rely on the ghc-pkg we just installed to work
If DESTDIR is defined, then on *nix machines ghc-pkg is a script that
doesn't point to the right path. Therefore we use the ghc-pkg binary
directly.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 2 |
1 files changed, 1 insertions, 1 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.% |