Fix #8675
authorAustin Seipp <austin@well-typed.com>
Fri, 17 Jan 2014 16:49:21 +0000 (10:49 -0600)
committerAustin Seipp <austin@well-typed.com>
Fri, 17 Jan 2014 16:49:21 +0000 (10:49 -0600)
Haddock no longer has a generated parser, so we don't need it in the
sdist and we certainly don't want to check for it in the ./configure
script (as that would be bogus.)

Signed-off-by: Austin Seipp <austin@well-typed.com>
aclocal.m4
ghc.mk

index 98f3e3d..63e8462 100644 (file)
@@ -898,11 +898,6 @@ then
     FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.0],
       [AC_MSG_ERROR([Alex version 3.1.0 or later is required to compile GHC.])])[]
 fi
-if test ! -f utils/haddock/src/Haddock/Lex.hs
-then
-    FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.0],
-      [AC_MSG_ERROR([Alex version 3.0 or later is required to compile Haddock.])])[]
-fi
 AlexVersion=$fptools_cv_alex_version;
 AC_SUBST(AlexVersion)
 AC_SUBST(Alex3)
diff --git a/ghc.mk b/ghc.mk
index dd91a82..f48714e 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -1136,8 +1136,6 @@ sdist-ghc-prep :
        $(call sdist_ghc_file,utils/hpc,dist-install,,,HpcParser,y)
        $(call sdist_ghc_file,utils/genprimopcode,dist,,,Lexer,x)
        $(call sdist_ghc_file,utils/genprimopcode,dist,,,Parser,y)
-       $(call sdist_ghc_file,utils/haddock,dist,src,Haddock,Lex,x)
-       $(call sdist_ghc_file,utils/haddock,dist,src,Haddock,Parse,y)
        cd $(SRC_DIST_GHC_DIR) && "$(FIND)" $(SRC_DIST_GHC_DIRS) \( -name .git -o -name "autom4te*" -o -name "*~" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | "$(XARGS)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS_REC)
 
 .PHONY: sdist-windows-tarballs-prep