Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Change /usr/local -> /usr/pbi/<app> before checking ldconfig dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
Kris Moore committed Mar 31, 2014
1 parent b9ee7c2 commit c3b7eb8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src-sh/pbi-manager/pbime/ldconfig
Expand Up @@ -36,12 +36,12 @@ ldconfig_start()
fi
fi
done
ldconfig_paths=`echo $ldconfig_paths | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
fi
done
_LDC=`echo $_LDC | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
${ldconfig} -elf ${_ins} -f ${ldconfig_file} ${_LDC}

Expand All @@ -56,14 +56,14 @@ ldconfig_start()
fi
done
_LDC=""
ldconfig32_paths=`echo $ldconfig_paths | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
for i in ${ldconfig32_paths}; do
if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
fi
done
check_startmsgs &&
echo '32-bit compatibility ldconfig path:' ${_LDC}
_LDC=`echo $_LDC | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
${ldconfig} -32 -m ${_ins} -f ${ldconfig32_file} ${_LDC}
;;
esac
Expand Down

0 comments on commit c3b7eb8

Please sign in to comment.