Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/mtools.sminc

    Diff of /branches/R11-unstable/include/mtools.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 14029 by niro, Mon Nov 12 15:56:03 2012 UTC revision 17041 by niro, Sun Apr 7 13:24:55 2013 UTC
    # Line 619  minstalllib() Line 619  minstalllib()
    619   # prefer scanelf   # prefer scanelf
    620   if [[ -x $(type -P scanelf) ]]   if [[ -x $(type -P scanelf) ]]
    621   then   then
    622   local soname="$(scanelf -SB ${file} | cut -d' ' -f2)"   local soname="$(scanelf -qBF '%S#p' ${file})"
    623   ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/${soname} || die   ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/${soname} || die
    624   else   else
    625   echo -e "${COLYELLOW}minstalllib(): Warning: scanelf not found, using fallback symlink method${COLDEFAULT}"   echo -e "${COLYELLOW}minstalllib(): Warning: scanelf not found, using fallback symlink method${COLDEFAULT}"
    # Line 683  mdelete() Line 683  mdelete()
    683   local dest="$1"   local dest="$1"
    684   local opts   local opts
    685    
    686     # enforce
    687     if [[ $1 = -f ]]
    688     then
    689     opts="-f"
    690     dest="$2"
    691     fi
    692    
    693   # recursive   # recursive
    694   if [[ $1 = -r ]] || [[ $1 = -R ]]   if [[ $1 = -r ]] || [[ $1 = -R ]]
    695   then   then
    # Line 899  maddconfig() Line 906  maddconfig()
    906   -b|--no-bindir) prefix=""; argv="$2" ;;   -b|--no-bindir) prefix=""; argv="$2" ;;
    907   esac   esac
    908    
    909   [[ -z ${argv} ]] && die "No  argument given!"   #[[ -z ${argv} ]] && die "No  argument given!"
    910    
    911   confdir="$(dirname ${MCONFIG})"   confdir="$(dirname ${MCONFIG})"
    912   if [[ ! -d ${prefix}/${confdir} ]]   if [[ ! -d ${prefix}/${confdir} ]]
    Legend:
    Removed from v.14029  
    changed lines
      Added in v.17041