Remove the haddock detection

Now that we build haddock in the GHC build, we don't need to look for it
on the path.

diff --git a/aclocal.m4 b/aclocal.m4
index f739bfe..99a4d03 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -254,27 +254,6 @@ AC_SUBST(HappyVersion)
 ])
 
 dnl
-dnl Check for Haddock and version.  If there's no installed Haddock, we look
-dnl for a haddock source tree and point the build system at that instead.
-dnl
-AC_DEFUN([FPTOOLS_HADDOCK],
-[AC_PATH_PROG(HaddockCmd,haddock,)
-dnl Darn, I forgot to make Haddock print out its version number when
-dnl invoked with -v.  We could try generating some HTML and grepping
-dnl through that to find the version number, but I think we'll make
-dnl do without it for now.
-# Haddock is passed to Cabal, so we need a native path
-if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
-   test "${OSTYPE}"      != "msys"                  && \
-   test "${HaddockCmd}"  != ""
-then
-    # Canonicalise to <drive>:/path/to/gcc
-    HaddockCmd=`cygpath -m ${HaddockCmd}`
-    AC_MSG_NOTICE([normalized haddock command to $HaddockCmd])
-fi
-])
-
-dnl
 dnl Check for Alex and version.  If we're building GHC, then we need
 dnl at least Alex version 2.0.1.
 dnl

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 944914e..e5522f5 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -1186,11 +1186,6 @@ ALEX_VERSION             = @AlexVersion@
 GHC_ALEX_OPTS          = -g
 
 #
-# Haddock
-# 
-HADDOCK                        = @HaddockCmd@
-
-#
 # Options for compiling in different `ways'. 
 # 
 # To configure up your own way, have a look at some of the standard ways

diff --git a/mk/package.mk b/mk/package.mk
index 1868ca0..028600a 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -270,13 +270,6 @@ ifneq "$(HS_PPS)" ""
 
 CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
 
-ifeq "$(HADDOCK)" ""
-html ::
-       @echo Haddock must be installed in order to build HTML library documentation.
-       @echo Please install Haddock and re-configure.
-       @exit 1
-endif
-
 html :: $(HTML_DOC)
 
 extraclean ::