projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few additions to better support PS3.
[mono.git]
/
scripts
/
mono-find-provides.in
diff --git
a/scripts/mono-find-provides.in
b/scripts/mono-find-provides.in
index ba46722ae679b29999d1bacbb74ce52aea687522..ac9d1c83aeb5528f6668f09472d0f68c05b3a43d 100644
(file)
--- 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)\$"))
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)
# Set the prefix, unless it is overriden (used when building mono rpms)
-: ${prefix=
$d/..
}
+: ${prefix=
@prefix@
}
-exec_prefix=$d/..
libdir=$prefix/@reloc_libdir@
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
# set LD_LIBRARY_PATH to ensure that libmono.so is found