default to installing runhaskell and hsc2hs again, but provide knobs to turn them off

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 640f33e..3c0b312 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -350,7 +350,6 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
-#   debug_u     : debugging unregisterised
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
 #   t          : ticky-ticky profiling
@@ -561,7 +560,7 @@ libdir0         := @libdir@
 includedir      := @includedir@
 mandir          := @mandir@
 
-ifeq "$(Windows)" "YES"
+ifeq "$(RelocatableBuild)" "YES"
 
 # Hack: our directory layouts tend to be different on Windows, so
 # hack around configure's bogus assumptions here.
@@ -569,6 +568,12 @@ datarootdir := $(prefix)
 datadir     := $(prefix)
 libdir      := $(prefix)
 
+docdir    := $(prefix)/doc
+htmldir   := $(docdir)
+dvidir    := $(docdir)
+pdfdir    := $(docdir)
+psdir     := $(docdir)
+
 else
 
 # Unix: override libdir and datadir to put ghc-specific stuff in
@@ -577,10 +582,6 @@ datarootdir := $(datadir0)
 datadir     := $(datadir0)/ghc-$(ProjectVersion)
 libdir      := $(libdir0)/ghc-$(ProjectVersion)
 
-endif # Windows
-
-headerdir := $(libdir)/include
-
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.
 
@@ -596,6 +597,10 @@ dvidir    := $(docdir)
 pdfdir    := $(docdir)
 psdir     := $(docdir)
 
+endif # Windows
+
+headerdir := $(libdir)/include
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
 ifacedir               = $(libdir)
@@ -636,6 +641,19 @@ INSTALL_HEADER  = $(INSTALL) -m 644
 INSTALL_MAN     = $(INSTALL) -m 644
 INSTALL_DIR     = $(MKDIRHIER)
 
+#
+# runhaskell and hsc2hs are special, in that other compilers besides
+# GHC might provide them.  Systems with a package manager often come
+# with tools to manage this kind of clash, e.g. RPM's
+# update-alternatives.  When building a distribution for such a system,
+# we recommend setting both of the following to 'YES'.
+#
+# NO_INSTALL_RUNHASKELL = YES
+# NO_INSTALL_HSC2HS     = YES
+#
+# NB. we use negative tests here because for binary-distributions we cannot
+# test build-time variables at install-time, so they must default to on.
+
 # -----------------------------------------------------------------------------
 # Utilities programs: flags 
 
@@ -1132,11 +1150,11 @@ HADDOCK                 = @HaddockCmd@
 #
 # The ways currently defined.
 #
-ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
+ALL_WAYS=p t s mp mg a b c d e f g h i j k l m n o A B
 USER_WAYS=a b c d e f g h j k l m n o A B
 
 #
-# The following ways currently have treated specially, p u t mg,
+# The following ways currently have treated specially, p t mg,
 # as the driver script treats these guys specially and needs to carefully be told
 # about the options for these. Hence, we hide the required command line options
 # for these in the driver, as this is the only place they are needed.
@@ -1155,10 +1173,6 @@ WAY_p_HC_OPTS= -prof
 WAY_t_NAME=ticky-ticky profiling
 WAY_t_HC_OPTS= -ticky
 
-# Way `u':
-WAY_u_NAME=unregisterized (using portable C only)
-WAY_u_HC_OPTS=-unreg
-
 # Way `mp': 
 WAY_mp_NAME=parallel
 WAY_mp_HC_OPTS=-parallel
@@ -1187,10 +1201,6 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
-# Way 'debug_u':
-WAY_debug_u_NAME=debug unregisterised
-WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
-
 # Way 'debug_t':
 WAY_debug_t_NAME=debug ticky-ticky profiling
 WAY_debug_t_HC_OPTS= -ticky -optc-DDEBUG