X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=df9e0d27abe3b8d21f1ed7bcd5733cc61534af9b;hb=0d52a0a134871d317b5f8b53a952c882ce5ae5b6;hp=6d61470b0867aedeab2b5feac1f75837dfda5aac;hpb=53386c359c55bd6eaa13c35fe174c9274ff5888e;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6d61470..df9e0d2 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -180,12 +180,6 @@ IncludeTestDirsInBuild=NO
 IncludeExampleDirsInBuild=NO
 
 #
-# Which ways should SGML documents be built?
-# options are: dvi ps pdf html rtf
-#
-SGMLDocWays=
-
-#
 # Which ways should DocBook XML documents be built?
 # options are: dvi ps pdf html
 #
@@ -253,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
@@ -606,12 +601,31 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
+#-----------------------------------------------------------------------------
+# install configuration
 
-################################################################################
 #
-#		Utilities programs: flags
+# Set this to have files installed with a specific owner
 #
-################################################################################
+INSTALL_OWNER =
+
+# 
+# Set this to have files installed with a specific group
+#
+INSTALL_GROUP =
+
+#
+# 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
@@ -716,6 +730,9 @@ else
 GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 endif
 
+# Set to YES if $(GHC) has the readline package installed
+GhcHasReadline	= @GhcHasReadline@
+
 HBC		= @HBC@
 NHC		= @NHC@
 
@@ -758,9 +775,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)
 #
@@ -887,27 +901,6 @@ 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
-
-SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
-
-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)
-
-DOCBOOK_CATALOG		= @Catalog@
-
-#-----------------------------------------------------------------------------
 # DocBook XML stuff
 
 XSLTPROC		= @XsltprocCmd@
@@ -919,6 +912,10 @@ DVIPS			= @DvipsCmd@
 
 DIR_DOCBOOK_XSL		= @DIR_DOCBOOK_XSL@
 
+XSLTPROC_LABEL_OPTS	= --stringparam toc.section.depth 3 \
+			  --stringparam section.autolabel 1 \
+			  --stringparam section.label.includes.component.label 1
+
 #-----------------------------------------------------------------------------
 # 		FPtools support software