autodeps: parse LIB_DIRS with more specificity
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
bc7b8e2eb2
commit
0f6b4f4fab
2 changed files with 4 additions and 4 deletions
|
@ -51,8 +51,8 @@ library_depends() {
|
||||||
|
|
||||||
unset prefix
|
unset prefix
|
||||||
for libdir in ${LIB_DIRS[@]}; do
|
for libdir in ${LIB_DIRS[@]}; do
|
||||||
if [[ ${libdir/*:} == ${libpath} ]]; then
|
if [[ ${libdir#*:} == ${libpath} ]]; then
|
||||||
prefix=${libdir/:*}
|
prefix=${libdir%%:*}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,8 @@ autodep_functions+=('library_provides')
|
||||||
library_provides() {
|
library_provides() {
|
||||||
if check_option "autodeps" "y"; then
|
if check_option "autodeps" "y"; then
|
||||||
for lib in ${LIB_DIRS[@]}; do
|
for lib in ${LIB_DIRS[@]}; do
|
||||||
dir=${lib/*:}
|
dir=${lib#*:}
|
||||||
prefix=${lib/:*}
|
prefix=${lib%%:*}
|
||||||
|
|
||||||
if [[ ! -d "$pkgdir/$dir" ]]; then
|
if [[ ! -d "$pkgdir/$dir" ]]; then
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Add table
Reference in a new issue