[m-rev.] For review: set default install-name path back to INSTALL_MERC_LIB_DIR

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.1
Branches: main

Set default value of --shlib-linker-install-name-path back to the value of
INSTALL_MERC_LIB_DIR, so building of user shared libraries works as described
in the user guide.  This was set to FINAL_INSTALL_MERC_LIB_DIR previously so
that Mercury distribution packages could be built correctly, but this is not a
problem anymore since --shlib-linker-install-name-path is now set manually in
the Mmakefiles for the Mercury build.

compiler/options.m

Index: compiler/options.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.436
diff -u -r1.436 options.m
--- compiler/options.m	5 Nov 2004 05:39:04 -0000	1.436
+++ compiler/options.m	30 Nov 2004 05:25:07 -0000
@@ -1284,7 +1284,7 @@
 	shlib_linker_use_install_name - bool(no),
 	shlib_linker_install_name_flag - string("-install_name "),
 	shlib_linker_install_name_path - string(
-		"$(FINAL_INSTALL_MERC_LIB_DIR)")
+		"$(INSTALL_MERC_LIB_DIR)")
 ]).
 option_defaults_2(build_system_option, [
 		% Build System Options
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------