aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-03 23:12:07 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-03 23:12:07 +0000
commit1956cf715f00382c822141561951590cb0ed8c3e (patch)
tree5aeb97a12e5183e64f99c43657d0358fdaadb9e2
parent51e11e272952299b5be0a8de6a38ed41a0f4855a (diff)
Follow changes in GHC build system
-rw-r--r--ghc.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/ghc.mk b/ghc.mk
index f69e403c..6a10a0f8 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -6,7 +6,13 @@ utils/haddock_dist_SHELL_WRAPPER = YES
utils/haddock_dist_INSTALL = YES
utils/haddock_dist_INSTALL_INPLACE = YES
utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME = haddock-ghc-$(ProjectVersion)
-utils/haddock_dist_PROG = haddock$(exeext)
+utils/haddock_dist_PROGNAME = haddock
+
+ifeq "$(HADDOCK_DOCS)" "NO"
+utils/haddock_dist_NOT_NEEDED = YES
+endif
+
+$(eval $(call build-prog,utils/haddock,dist,2))
ifneq "$(BINDIST)" "YES"
@@ -22,12 +28,6 @@ $(INPLACE_LIB)/latex:
endif
-ifeq "$(HADDOCK_DOCS)" "NO"
-utils/haddock_dist_NOT_NEEDED = YES
-endif
-
-$(eval $(call build-prog,utils/haddock,dist,2))
-
utils/haddock_dist_MODULES += Paths_haddock
ifeq "$(HADDOCK_DOCS)" "YES"