[project @ 2003-05-30 09:19:39 by simonpj]

Stop omitting Data.Generics from Haddockising,
	now that suitable #ifdefs make it go through.

	The #ifdefs mean that the documentation won't show
	the exports (:+:) etc, until Haddock learns about them.

	Merge to stable (but only this patch... not the earlier
	post-fork changes to Data.Generics)

diff --git a/Data/Generics.hs b/Data/Generics.hs
index 7de6995..e63d04a 100644 (file)
--- a/Data/Generics.hs
+++ b/Data/Generics.hs
@@ -51,8 +51,10 @@ module Data.Generics (
 import Prelude -- So that 'make depend' works
 
 #ifdef __GLASGOW_HASKELL__
+#ifndef __HADDOCK__
 import GHC.Base ( (:*:)(..), (:+:)(..), Unit(..) )
 #endif
+#endif
 
 import Data.Dynamic
 import Control.Monad

diff --git a/Makefile b/Makefile
index d0226f4..72446d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.42 2003/05/23 10:12:28 ross Exp $
+# $Id: Makefile,v 1.43 2003/05/30 09:19:39 simonpj Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -98,7 +98,6 @@ endif # OBJECT_FILEFORMAT = PEi
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-       Data/Generics.hs \
        GHC/PrimopWrappers.hs \
        GHC/PArr.hs