summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-04-07 18:54:25 +0100
committerIan Lynagh <ian@well-typed.com>2013-04-07 18:57:57 +0100
commit4373e84b60f1bf81b39fb54253fcad23acba025a (patch)
tree6cfee2edce5c768c839b52fd099146c58e1b9763 /ghc.mk
parenta7b08c05a883c350d017ebc9de5bb70b818bcb6a (diff)
downloadhaskell-4373e84b60f1bf81b39fb54253fcad23acba025a.tar.gz
Fix installation; fixes #7784
The build system thought that $(INSTALL_DYNLIBS) contained things like "terminfo", but actually it contains things like "libraries/terminfo".
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index a143c8edb9..c1b911ced0 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -888,7 +888,7 @@ install_packages: rts/package.conf.install
$(call INSTALL_DIR,"$(DESTDIR)$(topdir)/rts-1.0")
$(call installLibsTo, $(RTS_INSTALL_LIBS), "$(DESTDIR)$(topdir)/rts-1.0")
$(foreach p, $(INSTALL_DYNLIBS), \
- $(call installLibsTo, $(wildcard libraries/$p/dist-install/build/*.so libraries/$p/dist-install/build/*.dll libraries/$p/dist-install/build/*.dylib), "$(DESTDIR)$(topdir)/$p-$(libraries/$p_dist-install_VERSION)"))
+ $(call installLibsTo, $(wildcard $p/dist-install/build/*.so $p/dist-install/build/*.dll $p/dist-install/build/*.dylib), "$(DESTDIR)$(topdir)/$($p_PACKAGE)-$($p_dist-install_VERSION)"))
$(foreach p, $(INSTALL_PACKAGES), \
$(call make-command, \
"$(ghc-cabal_INPLACE)" copy \