[commit: ghc] master: Fix installation; fixes #7784 (4373e84)
Ian Lynagh
igloo at earth.li
Sun Apr 7 23:17:43 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/4373e84b60f1bf81b39fb54253fcad23acba025a
>---------------------------------------------------------------
commit 4373e84b60f1bf81b39fb54253fcad23acba025a
Author: Ian Lynagh <ian at well-typed.com>
Date: Sun Apr 7 18:54:25 2013 +0100
Fix installation; fixes #7784
The build system thought that $(INSTALL_DYNLIBS) contained things
like "terminfo", but actually it contains things like
"libraries/terminfo".
>---------------------------------------------------------------
ghc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ghc.mk b/ghc.mk
index a143c8e..c1b911c 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 \
More information about the ghc-commits
mailing list