[commit: haddock] master: Follow changes in GHC build system (1956cf7)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1956cf715f00382c822141561951590cb0ed8c3e

>---------------------------------------------------------------

commit 1956cf715f00382c822141561951590cb0ed8c3e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 3 23:12:07 2013 +0000

    Follow changes in GHC build system

>---------------------------------------------------------------

 ghc.mk |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index f69e403..6a10a0f 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"