[project @ 2000-05-09 15:37:07 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a20a3b1..b9466ba 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -209,6 +209,7 @@ GhcLibWays=p
 endif
 
 # Option flags to pass to GHC when it's compiling prelude modules
+# *and* standard library modules (std) *and* modules in hslibs
 # Typically these are things like -O or -dcore-lint
 # The ones that are *essential* are wired into ghc/lib/Makefile
 #
@@ -220,7 +221,7 @@ GhcLibHcOpts=-O
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 # Don't split object files for libs if we're building DLLs
 EnableWin32DLLs=@EnableWin32DLLs@
-ifeq "($EnableWin32DLLs)" "YES"
+ifeq "$(EnableWin32DLLs)" "YES"
 SplitObjs=NO
 else
 SplitObjs=YES
@@ -269,13 +270,15 @@ GhcLibToolsHcOpts=-O
 
 # Build the Haskell Readline bindings?
 #
-GhcLibsWithReadline=NO
-#
+GhcLibsWithReadline=@HaveReadlineHeaders@
+
+# Libraries needed for linking with readline
+LibsReadline=@LibsReadline@
+
 # Include path to readline.h
 # (no path == in standard include path)
 #
 ReadlineIncludePath=
-HaveLibReadline=@HaveLibReadline@
 
 ################################################################################
 #
@@ -377,7 +380,6 @@ datadir                 = @datadir@
 #sharedstatedir          = @sharedstatedir@
 #localstatedir           = @localstatedir@
 libdir                  = @libdir@
-infodir                        = @infodir@
 includedir              = @includedir@
 oldincludedir           = @oldincludedir@
 mandir                 = @mandir@
@@ -410,9 +412,6 @@ endif
 ifeq "$(strip $(libdir))" ""
 libdir         = $(exec_prefix)/lib
 endif
-ifeq "$(strip $(infodir))" ""
-infodir                = $(prefix)/info
-endif
 ifeq "$(strip $(includedir))" ""
 includedir     = $(prefix)/include
 endif
@@ -483,8 +482,6 @@ 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/
 GREENCARD_PREFIX       = $(FPTOOLS_TOP)/green-card/src/
@@ -640,14 +637,14 @@ YACC                      = @YaccCmd@
 
 SGML2DVI               = db2dvi
 SGML2HTML              = db2html
-SGML2INFO              = db2info
+SGML2PS                        = db2ps
 SGML2RTF               = db2rtf
 
 SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
 
 SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
-SRC_SGML2INFO_OPTS      = -d $(SGMLSTYLESHEET)
+SRC_SGML2PS_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
 #-----------------------------------------------------------------------------
@@ -673,17 +670,12 @@ BLD_DLL                   = dllwrap
 #
 # Stuff from fptools/literate
 #
-INFO                   = $(UTIL_PREFIX)info
-MAKEINFO               = $(INFO_PREFIX)makeinfo
-POSTMAKEINFO           = $(INFO_PREFIX)postmakeinfo
 LIT2PGM                = $(LITERATE_PREFIX)lit2pgm
-LIT2TEXI               = $(LITERATE_PREFIX)lit2texi
 LIT2HTML               = $(LITERATE_PREFIX)lit2html
 LIT2LATEX              = $(LITERATE_PREFIX)lit2latex
 MKDEPENDLIT            = $(LITERATE_PREFIX)mkdependlit
 LIT2CHANGELOG          = $(LITERATE_PREFIX)lit2changelog
 LIT2TEXT               = $(LITERATE_PREFIX)lit2text
-TEXI2HTML               = $(TEXI2HTML_PREFIX)texi2html
 
 #
 # Stuff from fptools/ghc/utils