X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ca8a553aa287bae0ddd0fb89acd6c5c7bea08058;hb=13f7bc6e91a4322f5e85af4389ea6a7ff96ee703;hp=d8fdf44f114499e32f5de489ad56a1e98b1a9c64;hpb=6f2ed8b680338aeb351522f61f09b29233ae36b4;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index d8fdf44..ca8a553 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -86,7 +86,7 @@ HostVendor_CPP	                = @HostVendor_CPP@
 #
 LeadingUnderscore=@LeadingUnderscore@
 
-# Pin a suffix on executables? If so, what. (cygwin32 only).
+# Pin a suffix on executables? If so, what (Windows only).
 exeext=@exeext@
 
 ################################################################################
@@ -110,7 +110,12 @@ exeext=@exeext@
 #		* ghc next
 #		then it's up to you
 
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+# need hslibs/lang first if we're bootstrapping
+ProjectsToBuild   = glafp-utils hslibs ghc
+else
 ProjectsToBuild   = glafp-utils ghc hslibs
+endif
 #
 # Make a distinction between building and installing
 #
@@ -209,6 +214,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
 #
@@ -370,19 +376,20 @@ FPTOOLS_TOP_ABS		= @hardtop@
 # 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@
-#UNUSED, see below: libexecdir              = @libexecdir@
-datadir                 = @datadir@
-#sysconfdir              = @datadir@
-#sharedstatedir          = @sharedstatedir@
-#localstatedir           = @localstatedir@
-libdir                  = @libdir@
-infodir		        = @infodir@
-includedir              = @includedir@
-oldincludedir           = @oldincludedir@
+prefix			= @prefix@
+exec_prefix		= @exec_prefix@
+bindir			= @bindir@
+datadir			= @datadir@
+#sysconfdir		= @datadir@
+#sharedstatedir		= @sharedstatedir@
+#localstatedir		= @localstatedir@
+libdir			= @libdir@
+includedir		= @includedir@
+oldincludedir		= @oldincludedir@
 mandir			= @mandir@
+
+#UNUSED, see below: libexecdir              = @libexecdir@
+#UNUSED:infodir		= @infodir@
 #UNUSED:srcdir          = @srcdir@
 
 # 
@@ -412,9 +419,6 @@ endif
 ifeq "$(strip $(libdir))" ""
 libdir		= $(exec_prefix)/lib
 endif
-ifeq "$(strip $(infodir))" ""
-infodir		= $(prefix)/info
-endif
 ifeq "$(strip $(includedir))" ""
 includedir	= $(prefix)/include
 endif
@@ -480,13 +484,9 @@ ETAGS_PREFIX		= $(GLAFP_UTILS)/etags/
 MSUB_PREFIX		= $(GLAFP_UTILS)/msub/
 LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
-
-# Still used?
-LITERATE	    	= $(FPTOOLS_TOP)/literate
+DOCBOOK_PREFIX		= $(GLAFP_UTILS)/docbook/
 
 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/
@@ -603,7 +603,7 @@ SHELL			= /bin/sh
 # We do not use SHELL to execute long commands, as `make' will more than likely
 # override whatever setting you have in your environment while executing. 
 
-# By default, REAL_SHELL is set equal SHELL, which is not really a smart move
+# By default, REAL_SHELL is set equal to SHELL, which is not really a smart move
 # as it is SHELL that will show up the bogosity in the first place, but setting
 # it to anything else isn't really portable.
 #
@@ -618,7 +618,7 @@ TAR			= @TarCmd@
 ZIP			= zip
 
 #
-# Under cygwin32, we have to deal with .exe suffixes
+# Under Windows, we have to deal with .exe suffixes
 #
 EXE_SUFFIX=@ExeSuffix@
 
@@ -638,12 +638,15 @@ UNAME			= uname
 YACC			= @YaccCmd@
 
 #-----------------------------------------------------------------------------
-# SGML stuff (currently not configured - we assume you have it)
+# SGML stuff
+
+JADE			= @JadeCmd@
 
-SGML2DVI		= db2dvi
-SGML2HTML		= db2html
-SGML2PS			= db2ps
-SGML2RTF		= db2rtf
+SGML2DVI		= $(DOCBOOK_PREFIX)db2dvi
+SGML2HTML		= $(DOCBOOK_PREFIX)db2html
+SGML2PS			= $(DOCBOOK_PREFIX)db2ps
+SGML2PDF		= $(DOCBOOK_PREFIX)db2pdf
+SGML2RTF		= $(DOCBOOK_PREFIX)db2rtf
 
 SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
 
@@ -675,17 +678,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