From 9e369a2a812962ddd96572c251da73ae9f98b95c Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Wed, 18 Aug 2010 18:57:24 +0000
Subject: Fix installation in the GHC build system Data-files are now in
 subdirectories, so we need to handle that

---
 ghc.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index bc44b13d..c8a692ed 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -35,10 +35,10 @@ install_utils/haddock_html:
 install: install_utils/haddock_data
 .PHONY: install_utils/haddock_data
 install_utils/haddock_data:
-	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/html"
-	for i in utils/haddock/html/*; do \
-	    $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)/html"; \
-	done
+	$(foreach i,$(sort $(dir $(utils/haddock_dist_DATA_FILES))), \
+	    $(call make-command,$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/$i"))
+	$(foreach i,$(utils/haddock_dist_DATA_FILES), \
+	    $(call make-command,$(INSTALL_DATA) $(INSTALL_OPTS) utils/haddock/$i "$(DESTDIR)$(ghclibdir)/$(dir $i)"))
 
 ifeq "$(Windows)" "NO"
 install: install_haddock_link
-- 
cgit v1.2.3