[project @ 2002-05-22 09:02:40 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a81ff84..d2a1267 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -17,9 +17,11 @@
 #        so if you edit config.mk your changes will be spammed.
 #
 #      - Settings in this file may be overriden by giving replacement
-#        definitions in build.mk.  If you don't have a build.mk file
-#        then you get defaults for everything.  The defaults should
-#        provide a reasonable vanilla build.
+#        definitions in build.mk.  See build.mk.sample for a good
+#        starting point for a build.mk file.
+#
+#        If you don't have a build.mk file then you get defaults for everything.
+#        The defaults should provide a reasonable vanilla build.
 #
 # This is one of only two files that configure generates (the other is config.h)
 #
@@ -99,9 +101,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
 # build the libs first if we're bootstrapping from .hc files
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib
+AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock
 else
-AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock
 endif
 
 #
@@ -838,7 +840,7 @@ HAPPY_VERSION               = @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS         = @HappyOpts@
+GHC_HAPPY_OPTS         = -agc
 
 #
 # Stuff from fptools/literate