Magellan Linux

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 14481 by niro, Fri Dec 21 13:35:02 2012 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 698  mdelete() Line 698  mdelete()
698   fi   fi
699    
700   [[ -z ${dest} ]] && die "No dest given."   [[ -z ${dest} ]] && die "No dest given."
701   [[ ! -e ${BINDIR}/${dest} ]] && die "${BINDIR}/${dest} does not exist."   if [[ ! -e ${BINDIR}/${dest} ]] || [[ ! -L ${BINDIR}/${dest} ]]
702     die "${BINDIR}/${dest} does not exist."
703     if
704    
705   rm -v ${opts} ${BINDIR}/${dest} || die   rm -v ${opts} ${BINDIR}/${dest} || die
706  }  }

Legend:
Removed from v.14029  
changed lines
  Added in v.14481