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 /mk | |
| 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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 5 | ||||
| -rw-r--r-- | mk/package.mk | 7 |
2 files changed, 0 insertions, 12 deletions
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 :: |