Merge pull request #704 from jgagnon/master

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

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index 52ea756fd87d3ecff5f59d98ae67604544e7293e..5e440ab046bf8a6058aed1214e51a7ecc400234e 100644 (file)
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -14,7 +14,7 @@ monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 
 # 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/"))
+monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
 # Disabled... see ChangeLog
 
 # Set the prefix, unless it is overriden (used when building mono rpms)
@@ -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/4.5
 
 for i in "${monolist[@]}"; do
         ($bindir/monodis --assembly $i | awk '