aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-08-16 18:42:44 +0000
committerIan Lynagh <igloo@earth.li>2009-08-16 18:42:44 +0000
commitd62ac71e92c8d13b311e4e5d5c72114810534eb8 (patch)
tree041e0d7ab1d6d867df3cc51a9b62c6862e1d41d6
parenta08b2ea0b62799ba94602829a2db5b99d7837272 (diff)
Follow GHC build system changes
-rw-r--r--ghc.mk5
-rw-r--r--haddock.wrapper2
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+"$@"}