[m-rev.] diff: fix configuration bug

Simon Taylor stayl at cs.mu.OZ.AU
Tue Apr 15 18:33:15 AEST 2003


Estimated hours taken: 1
Branches: main

compiler/handle_options.m:
	Mercury.config should be read from MERCURY_CONFIG_DIR,
	not MERCURY_STDLIB_DIR (MERCURY_STDLIB_DIR will usually
	be set by Mercury.config).

Index: handle_options.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/handle_options.m,v
retrieving revision 1.179
diff -u -u -r1.179 handle_options.m
--- handle_options.m	28 Mar 2003 06:42:47 -0000	1.179
+++ handle_options.m	15 Apr 2003 08:26:42 -0000
@@ -1045,9 +1045,9 @@
 	globals__io_lookup_maybe_string_option(config_file, ConfigFile),
 	% yes("") means `--config-file' was not passed on the command line.
 	( { ConfigFile = yes("") } ->
-		( { MaybeStdLibDir = yes(StdLibDir1) } ->
+		( { MaybeConfDir = yes(ConfDir1) } ->
 			globals__io_set_option(config_file, maybe_string(yes(
-				StdLibDir1/"conf"/"Mercury.config")))
+				ConfDir1/"conf"/"Mercury.config")))
 		;
 			globals__io_set_option(config_file, maybe_string(no))
 		)
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list