set MONO_PATH to ensure that mscorlib.dll can be found

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

diff --git a/ChangeLog b/ChangeLog
index 3b04af750fb17fa0a3995c6a3ed9b85b8a947ed9..06704dddf5eab92a616b3c3840dcefeb5bcfcfd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-05-11  Andrew Jorgensen  <ajorgensen@novell.com>
 
        * scripts/mono-find-*.in: Look for libmono-2.0.so.1, not libmono.so
+       and set MONO_PATH to ensure that mscorlib.dll can be found
 
 2010-04-29  Andreas Färber  <andreas.faerber@web.de>
 

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index 52ea756fd87d3ecff5f59d98ae67604544e7293e..c9210060c26e83fd628c11705e0147b8d2c02913 100644 (file)
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -32,6 +32,8 @@ fi
 
 # set LD_LIBRARY_PATH to ensure that libmono is found
 export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+# and set MONO_PATH to ensure that mscorlib.dll can be found
+export MONO_PATH=$prefix/lib/mono/2.0
 
 for i in "${monolist[@]}"; do
         ($bindir/monodis --assembly $i | awk '

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index 8bc68ffa13726bb09f21a95c32cec8f4b4ee8cdb..f0ad60bb8a2955b4b87e3433ae08fa0e470b196e 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -49,6 +49,8 @@ esac
 
 # set LD_LIBRARY_PATH to ensure that libmono is found
 export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+# and set MONO_PATH to ensure that mscorlib.dll can be found
+export MONO_PATH=$prefix/lib/mono/2.0
 
 REQUIRES=$(
        for i in "${monolist[@]}"; do