Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / scripts / mono-find-requires.in

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index 452456ed5e96d754d5f9aa5b4f68790e5ac80529..5e0ef2f1cfd35e650d84d380c553d3d108a48dc0 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -9,6 +9,8 @@
 # (C) 2008 Novell (http://www.novell.com)
 #
 
+if [ -n "$DISABLE_MONO_RPM_AUTO_DEPS" ]; then exit 0; fi
+
 IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
@@ -28,7 +30,7 @@ libdir=$prefix/@reloc_libdir@
 bindir=$prefix/bin
 
 # Bail out if monodis or libmono is missing
-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
        echo "monodis missing or unusable, exiting..." 1>&2
        exit 1
 fi
@@ -47,8 +49,10 @@ case `uname -m` in
        ia64)   libext="()(64bit)" ;;
 esac
 
-# set LD_LIBRARY_PATH to ensure that libmono.so is found
+# 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/4.5
 
 REQUIRES=$(
        for i in "${monolist[@]}"; do