From c8b226232b529d2543f72dbcd1984d669bba9e8b Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 29 Mar 2009 15:31:43 +0000
Subject: GHC new build system fixes

---
 ghc.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 7020834c..5d6cb9a0 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -8,18 +8,25 @@ utils/haddock_dist_SHELL_WRAPPER = YES
 utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES
 utils/haddock_dist_PROG = haddock$(exeext)
 
+ifneq "$(BINDIST)" "YES"
+
 $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html
 
 $(INPLACE_LIB)/html:
 	$(RM) -rf $@
 	$(CP) -R utils/haddock/html $@
 
+$(eval $(call build-prog,utils/haddock,dist,2))
+
+utils/haddock_dist_MODULES += Paths_haddock
+
+endif
+
 install: install_utils/haddock_html
 .PHONY: install_utils/haddock_html
 install_utils/haddock_html:
 	$(RM) -rf $(DESTDIR)$(datadir)/html
 	$(CP) -R utils/haddock/html $(DESTDIR)$(datadir)/html
 
-$(eval $(call build-prog,utils/haddock,dist,2))
+$(eval $(call bindist,utils/haddock,ghc.mk html/*))
 
-utils/haddock_dist_MODULES += Paths_haddock
-- 
cgit v1.2.3