[project @ 2004-11-10 12:20:00 by ross]

Add a make variable COMPILER (default: ghc) to select a configuration file
from the config directory without have=ing to give a full path.

testsuite/README

@@ -41,7 +41,7 @@ Running the testsuite with a compiler other than GHC
 	autoconf
 	./configure
 	cd testsuite
-	make TestCompiler=nhc98
+	make TEST_HC=nhc98 COMPILER=nhc98
 )
 
 
@@ -62,6 +62,8 @@ The following variables may be set on the make command line:
 	EXTRA_HC_OPTS		-- extra flags to send to the Haskell compiler
 	EXTRA_RUNTEST_OPTS 	-- extra flags to give the test driver
 	CONFIG			-- use a different configuration file
+	COMPILER		-- stem of a different configuration file
+				-- from the config directory [default: ghc]
 	WAY			-- just this way
 
 The following ways are defined (for GHC):

testsuite/mk/test.mk

@@ -12,6 +12,7 @@
 #	EXTRA_HC_OPTS	-- extra flags to send to the Haskell compiler
 #	EXTRA_RUNTEST_OPTS -- extra flags to give the test driver
 #	CONFIG		-- use a different configuration file
+#	COMPILER	-- select a configuration file from config/
 #
 # -----------------------------------------------------------------------------
 
@@ -30,7 +31,8 @@ GHC_INPLACE_ABS	= $(FPTOOLS_TOP_ABS)/ghc/compiler/ghc-inplace
 EXTRA_HC_OPTS += -D$(HostPlatform_CPP)
   # ideally TargetPlatform_CPP, but that doesn't exist; they're always the same anyway
 RUNTESTS     = $(TOP)/driver/runtests.py
-CONFIG       = $(TOP)/config/ghc
+COMPILER     = ghc
+CONFIG       = $(TOP)/config/$(COMPILER)
 
 # can be overriden from the command line
 TEST_HC = $(GHC_INPLACE_ABS)