X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2Fmono-find-provides.in;h=ac9d1c83aeb5528f6668f09472d0f68c05b3a43d;hb=f20a93692670b2e3b9040a0b91ab258fad91a499;hp=7f677202006328bbaf90c3e5f58c551225fd48a2;hpb=38f320d19a29a3e7d6a92cdb0b3ebec149d7c1a7;p=mono.git

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index 7f677202006..ac9d1c83aeb 100644
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -12,18 +12,22 @@ 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.so ] ; then
+	echo "monodis missing or unusable, exiting..." 1>&2
+	exit 1
+fi
 
 
 # set LD_LIBRARY_PATH to ensure that libmono.so is found
@@ -35,6 +39,14 @@ for i in "${monolist[@]}"; do
                 /^Version:/ { VERSION=$2 }
                 /^Name:/    { LIBNAME=$2 }
                 END {
+			if (LIBNAME ~ /^policy/) {
+				cnt = split(LIBNAME, toks, ".")
+				VERSION=toks[2] "." toks[3] ".0.0"
+				LIBNAME=""
+				for (i=4; i<= cnt; i++)
+					LIBNAME = (LIBNAME toks[i] ".")
+				LIBNAME=substr(LIBNAME, 1, length(LIBNAME)-1)
+			}
                         if (VERSION && LIBNAME)
                                 print "mono(" LIBNAME ") = " VERSION
                 }