From d62ac71e92c8d13b311e4e5d5c72114810534eb8 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 16 Aug 2009 18:42:44 +0000
Subject: Follow GHC build system changes

---
 ghc.mk          | 5 +++--
 haddock.wrapper | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index e3e2447d..1e65b76b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -24,8 +24,9 @@ utils/haddock_dist_MODULES += Paths_haddock
 install: install_utils/haddock_html
 .PHONY: install_utils/haddock_html
 install_utils/haddock_html:
-	"$(RM)" $(RM_OPTS) -r $(DESTDIR)$(datadir)/html
-	"$(CP)" -R utils/haddock/html $(DESTDIR)$(datadir)/html
+	"$(RM)" $(RM_OPTS) -r $(DESTDIR)$(docdir)/html
+	$(INSTALL_DIR) $(DESTDIR)$(docdir)/html
+	"$(CP)" -R utils/haddock/html $(DESTDIR)$(docdir)/html
 
 BINDIST_EXTRAS += $(addprefix utils/haddock/,html/*)
 
diff --git a/haddock.wrapper b/haddock.wrapper
index 0888c2f4..0895fbac 100644
--- a/haddock.wrapper
+++ b/haddock.wrapper
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec $executablename -B$datadir -l$datadir ${1+"$@"}
+exec $executablename -B$topdir -l$topdir ${1+"$@"}
-- 
cgit v1.2.3