X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2Fmono-find-provides.in;h=c9210060c26e83fd628c11705e0147b8d2c02913;hb=acaa69acb7bc42f21cdd507c1f2a01dc3bcd1fb9;hp=ba46722ae679b29999d1bacbb74ce52aea687522;hpb=f73e0d5c67f0d26e85b92fc4b75fc48783f20d64;p=mono.git

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index ba46722ae67..c9210060c26 100644
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -12,22 +12,28 @@ IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 
-a=`which "$0"`
-d=`dirname "$a"`
+# Only include files with /gac/ in path
+#  (Allows packages to contain private assemblies that don't conflict with other packages)
+#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
+# Disabled... see ChangeLog
 
 # Set the prefix, unless it is overriden (used when building mono rpms)
-: ${prefix=$d/..}
+: ${prefix=@prefix@}
 
-exec_prefix=$d/..
 libdir=$prefix/@reloc_libdir@
-bindir=$d
+bindir=$prefix/bin
 
-[ -x $bindir/monodis ] || exit 0;
-[ -f $libdir/libmono.so ] || exit 0;
+# Bail out if monodis or libmono is missing
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono-2.0.so.1 ] ; then
+	echo "monodis missing or unusable, exiting..." 1>&2
+	exit 1
+fi
 
 
-# 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/2.0
 
 for i in "${monolist[@]}"; do
         ($bindir/monodis --assembly $i | awk '