diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-05 18:25:53 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-05 18:25:53 +0000 |
| commit | 5c1039224e8595ed2acd6518316a1075f5a6b78a (patch) | |
| tree | 237bcacf35b321febfd2bc40db6aa5617523e6c4 | |
| parent | d1876c6ae9cf821685a7035bea728f9fb1b12899 (diff) | |
| download | haskell-5c1039224e8595ed2acd6518316a1075f5a6b78a.tar.gz | |
Remove the haddock detection
Now that we build haddock in the GHC build, we don't need to look for it
on the path.
| -rw-r--r-- | aclocal.m4 | 21 | ||||
| -rw-r--r-- | mk/config.mk.in | 5 | ||||
| -rw-r--r-- | mk/package.mk | 7 |
3 files changed, 0 insertions, 33 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index f739bfe3f1..99a4d03ff6 100644 --- 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 944914ed69..e5522f50c6 100644 --- 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 1868ca07fd..028600a3e2 100644 --- 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 :: |