X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2Fmono-find-provides.in;h=ac9d1c83aeb5528f6668f09472d0f68c05b3a43d;hb=83569e1ef07325ec30b00d3e2b955718f210e608;hp=ff649639f470058ee2bcea531f410a34865751c4;hpb=b39d5edf62fb3908e10647e1a7e60dadeb88b2be;p=mono.git diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in index ff649639f47..ac9d1c83aeb 100644 --- a/scripts/mono-find-provides.in +++ b/scripts/mono-find-provides.in @@ -14,20 +14,20 @@ 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/")) - -a=`which "$0"` -d=`dirname "$a"` +#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