[project @ 1997-03-20 22:59:08 by sof]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c8fa245..35ce354 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -180,7 +180,12 @@ GhcLibHcOpts= -split-objs -odir $(basename $*)
 
 # Build the Haskell Readline bindings?
 #
-HsLibsWithReadline=YES
+HsLibsWithReadline=NO
+#
+# Include path to readline.h
+# (no path == in standard include path)
+#
+ReadlineIncludePath=
 
 # Build the socket libraries?
 #
@@ -192,6 +197,9 @@ HsLibsWithSockets=YES
 #
 HsLibWays=$(GhcLibWays)
 
+# Option flags for hslibs are by default the same as for the options
+# used for the prelude libs (see above).
+HsLibHcOpts=$(GhcLibHcOpts)
 
 #################################################################################
 #
@@ -265,37 +273,32 @@ NoFibHcOpts=
 #
 #################################################################################
 
-# These variables are all ":=" variables so that you can easily attach
-# extra stuff to the end of them, like this:
-#
-#      libdir := $(libdir)/ghc
-
-TMPDIR                 := /tmp
+TMPDIR                 = /tmp
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
 
-FPTOOLS_TOP_ABS                := @hardtop@
+FPTOOLS_TOP_ABS                = @hardtop@
 
 #
 # Installation directories, we don't use half of these,
 # but since the configure script has them on offer while
 # passing through, we might as well set them.
 
-prefix                  := @prefix@
-exec_prefix             := @exec_prefix@
-bindir                  := @bindir@
-sbindir                 := @sbindir@
-libexecdir              := @libexecdir@
-datadir                 := @datadir@
-sysconfdir              := @datadir@
-sharedstatedir          := @sharedstatedir@
-localstatedir           := @localstatedir@
-libdir                  := @libdir@
-infodir                        := @infodir@
-includedir              := @includedir@
-oldincludedir           := @oldincludedir@
-mandir                 := @mandir@
-srcdir                  := @srcdir@
+prefix                  = @prefix@
+exec_prefix             = @exec_prefix@
+bindir                  = @bindir@
+sbindir                 = @sbindir@
+libexecdir              = @libexecdir@
+datadir                 = @datadir@
+sysconfdir              = @datadir@
+sharedstatedir          = @sharedstatedir@
+localstatedir           = @localstatedir@
+libdir                  = @libdir@
+infodir                        = @infodir@
+includedir              = @includedir@
+oldincludedir           = @oldincludedir@
+mandir                 = @mandir@
+srcdir                  = @srcdir@
 
 #################################################################################
 #
@@ -399,6 +402,7 @@ MKDIRHIER_PREFIX    = $(GLAFP_UTILS)/mkdirhier/
 LITERATE               = $(FPTOOLS_TOP)/literate
 
 LITERATE_PREFIX        = $(FPTOOLS_TOP)/literate/
+INFO_PREFIX                    = $(FPTOOLS_TOP)/literate/info-utils/
 TEXI2HTML_PREFIX        = $(LITERATE_PREFIX)texi2html/
 
 HAPPY_PREFIX           = $(FPTOOLS_TOP)/happy/src/
@@ -513,7 +517,7 @@ RUNTEST                     = $(RUNTEST_PREFIX)runstdtest
 HAPPY                  = @HappyCmd@
 LX                     = @LxCmd@
 
-ifneq "$(HAPPY)" ""
+ifeq "$(HAPPY)" ""
 HAPPY                  = $(HAPPY_PREFIX)happy
 endif