X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=27dc20acb50506c191e60243eae06f3fe492592a;hb=baf4a0612e370ebe0f397c27024feb8ced23e08a;hp=ff0c349bbc42ece39556dd4aa28add0a35ab25bd;hpb=cc33dd28f9931d01ff378e428eb5f38d25541a06;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ff0c349..27dc20a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -180,10 +180,10 @@ IncludeTestDirsInBuild=NO
 IncludeExampleDirsInBuild=NO
 
 #
-# Which ways should SGML documents be built?
-# options are: dvi ps pdf html rtf
+# Which ways should DocBook XML documents be built?
+# options are: dvi ps pdf html
 #
-SGMLDocWays=
+XMLDocWays=
 
 ################################################################################
 #
@@ -247,8 +247,9 @@ GhcUnregisterised=NO
 # (as well as a C backend)
 #
 # Target platforms supported:
-#   i386, sparc & powerpc
-ifneq "$(findstring $(HostArch_CPP), i386 sparc powerpc)" ""
+#   i386, powerpc
+#   sparc has bitrotted
+ifneq "$(findstring $(HostArch_CPP), i386 powerpc)" ""
 GhcWithNativeCodeGen=YES
 else
 GhcWithNativeCodeGen=NO
@@ -317,17 +318,6 @@ GhcLibHcOpts=-O -Rghc-timing
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
 
-# Win32 only: are we building a compiler that tries to reduce external
-# dependencies? i.e., one that doesn't assume that the user has got
-# the cygwin toolchain installed on his/her Win32 box.
-#
-# GHC is still dependent on GNU tools in the backend (gcc to further process
-# .c/.hc/.s/.o files + 'perl' to mangle and split), but using this
-# option a GHC distribution can be put together which includes a minimal
-# set of these open source tools. 
-#
-MinimalUnixDeps=@MinimalUnixDeps@
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -396,27 +386,6 @@ LIBM=@LIBM@
 #
 GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 
-# Build the Haskell OpenGL binding?
-#
-GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
-GLU_CFLAGS=@GLU_CFLAGS@
-GLU_LIBS=@GLU_LIBS@
-
-# Build the Haskell OpenAL binding?
-#
-GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
-
-# Build the Haskell GLUT binding?
-#
-GhcLibsWithGLUT=@GhcLibsWithGLUT@
-GLUT_LIBS=@GLUT_LIBS@
-
-# X11 stuff
-#
-GhcLibsWithX11=@GhcLibsWithX11@
-X_CFLAGS=@X_CFLAGS@
-X_LIBS=@X_LIBS@
-
 # .NET interop support?
 #
 DotnetSupport=@DotnetSupport@
@@ -528,8 +497,6 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 # but since the configure script has them on offer while
 # passing through, we might as well set them.
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
@@ -539,52 +506,31 @@ includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
+ifeq "$(Windows)" "YES"
+
 ifeq "$(strip $(prefix))" ""
 prefix		= c:/ghc
 endif
 
-ifacedir   = $(libdir)
-
-ifeq "$(strip $(exec_prefix))" ""
-exec_prefix		= $(prefix)
-endif
-ifeq "$(strip $(bindir))" ""
-bindir			= $(exec_prefix)/bin
-endif
-
-libexecdir		= $(libdir)
-
-ifeq "$(strip $(datadir))" ""
-datadir		= $(prefix)/imports
-endif
-ifeq "$(strip $(libdir))" ""
+# Hack: our directory layouts tend to be different on Windows, so
+# hack around configure's bogus assumptions here.
+datadir 	= $(prefix)
 libdir		= $(prefix)
-endif
-ifeq "$(strip $(includedir))" ""
-includedir	= $(prefix)/include
-endif
 
 else
 
-prefix			= @prefix@
-exec_prefix		= @exec_prefix@
-bindir			= @bindir@
-datadir0		= @datadir@
-libdir0			= @libdir@
-includedir		= @includedir@
-oldincludedir		= @oldincludedir@
-mandir			= @mandir@
-
 #
-# override libdir and datadir to put project-specific stuff in
+# Unix: override libdir and datadir to put project-specific stuff in
 # a subdirectory with the version number included.
 #
 libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
 datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
 
+endif # Windows
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
-ifacedir   = $(libdir)
+ifacedir		= $(libdir)
 
 # 
 # Default values for most of the above are only set if
@@ -623,14 +569,31 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-endif  # i386-unknown-mingw32
+#-----------------------------------------------------------------------------
+# install configuration
 
+#
+# Set this to have files installed with a specific owner
+#
+INSTALL_OWNER =
+
+# 
+# Set this to have files installed with a specific group
+#
+INSTALL_GROUP =
 
-################################################################################
 #
-#		Utilities programs: flags
+# Invocations of `install' for the four different classes
+# of targets:
 #
-################################################################################
+INSTALL_PROGRAM = $(INSTALL) -m 755
+INSTALL_SCRIPT  = $(INSTALL) -m 755
+INSTALL_SHLIB   = $(INSTALL) -m 755
+INSTALL_DATA    = $(INSTALL) -m 644
+INSTALL_DIR     = $(MKDIRHIER)
+
+# -----------------------------------------------------------------------------
+# Utilities programs: flags 
 
 # If you want to give any standard flags to pretty much any utility
 # (see utils.mk for a complete list), by adding a line here
@@ -777,9 +740,6 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 SRC_CC_OPTS += -G0
 endif
 
-# Solaris2 strikes again.
-unix_SRC_HSC2HS_OPTS += @unix_SRC_HSC2HS_OPTS@
-
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -803,11 +763,6 @@ HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 HavePosixRegex  = @HavePosixRegex@
 
 #-----------------------------------------------------------------------------
-# GTK+
-
-GTK_CONFIG		= @GTK_CONFIG@
-
-#-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
 
 # FLEX			= @LEX@
@@ -857,12 +812,17 @@ RM			= rm -f
 SED			= @SedCmd@
 SHELL			= /bin/sh
 
+LD			= @LdCmd@
+
 # Some ld's support the -x flag and some don't, so the configure
 # script detects which we have and sets LdXFlag to "-x" or ""
 # respectively.
-LD			= @LdCmd@
 LD_X			= @LdXFlag@
 
+# GNU ld supports input via a linker script, which is useful to avoid
+# overflowing command-line length limits.
+LdIsGNULd		= @LdIsGNULd@
+
 #
 # In emergency situations, REAL_SHELL is used to perform shell commands
 # from within the ghc driver script, by scribbling the command line to
@@ -906,25 +866,20 @@ TROFF			= troff
 UNAME			= uname
 
 #-----------------------------------------------------------------------------
-# SGML stuff
-
-JADE			= @JadeCmd@
-
-SGML2DVI		= $(DOCBOOK_PREFIX)db2dvi
-SGML2HTML		= $(DOCBOOK_PREFIX)db2html
-SGML2PS			= $(DOCBOOK_PREFIX)db2ps
-SGML2PDF		= $(DOCBOOK_PREFIX)db2pdf
-SGML2RTF		= $(DOCBOOK_PREFIX)db2rtf
+# DocBook XML stuff
 
-SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
+XSLTPROC		= @XsltprocCmd@
+XMLLINT			= @XmllintCmd@
+FOP			= @FopCmd@
+XMLTEX			= @XmltexCmd@
+PDFXMLTEX		= @PdfxmltexCmd@
+DVIPS			= @DvipsCmd@
 
-SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
-SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
-SRC_SGML2PS_OPTS      	= -d $(SGMLSTYLESHEET)
-SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
-SRC_SGML2PDF_OPTS       = -d $(SGMLSTYLESHEET)
+DIR_DOCBOOK_XSL		= @DIR_DOCBOOK_XSL@
 
-DOCBOOK_CATALOG		= @Catalog@
+XSLTPROC_LABEL_OPTS	= --stringparam toc.section.depth 3 \
+			  --stringparam section.autolabel 1 \
+			  --stringparam section.label.includes.component.label 1
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software
@@ -938,7 +893,6 @@ ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
-LX			= @LxCmd@
 
 BLD_DLL			= dllwrap