2005-11-09 Miguel de Icaza <miguel@novell.com>

	* unix/util.c (set_dirs): Instead of hardcoding the value to
	/usr/bin, use MONO_BINDIR which comes from Automake's bindir.  If
	the executable is in the place configured, use the Automake
	settings.  Otherwise use the standard-layout based computed
	paths. 

svn path=/trunk/mono/; revision=52792

mono/os/ChangeLog

@@ -1,3 +1,11 @@
+2005-11-09  Miguel de Icaza  <miguel@novell.com>
+
+	* unix/util.c (set_dirs): Instead of hardcoding the value to
+	/usr/bin, use MONO_BINDIR which comes from Automake's bindir.  If
+	the executable is in the place configured, use the Automake
+	settings.  Otherwise use the standard-layout based computed
+	paths. 
+
 2005-11-08  Miguel de Icaza  <miguel@novell.com>
 
 	* unix/util.c (set_dirs): The buffer is overwritten by the

mono/os/unix/Makefile.am

@@ -9,7 +9,7 @@ assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
-INCLUDES = -I$(top_srcdir) -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" $(GLIB_CFLAGS) 
+INCLUDES = -I$(top_srcdir) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" $(GLIB_CFLAGS) 
 
 noinst_LTLIBRARIES = libmonoos.la
 

mono/os/unix/util.c

@@ -47,7 +47,7 @@ set_dirs (char *exe)
 	/*
 	 * Only /usr prefix is treated specially
 	 */
-	if (strncmp (exe, "/usr/bin/", 9) == 0 || (base = compute_base (exe)) == NULL){
+	if (strncmp (exe, MONO_BINDIR, strlen (MONO_BINDIR)) == 0 || (base = compute_base (exe)) == NULL){
 		fallback ();
 		return;
 	} else {