When computing dirs in auto_dir also consider symlink entries.
Use metaprefix to locate metadata when adding relnotes.
This commit is contained in:
parent
34c7c7f1bc
commit
546b05fa8f
@ -436,7 +436,7 @@ auto_dir()
|
|||||||
local i
|
local i
|
||||||
local j
|
local j
|
||||||
|
|
||||||
fdirs=$($AWK '/^f/ { print $3 }' $metadir/prototype.$secname | $SED -e 's,\(.*\)/.*$,\1,' | $SORT -u)
|
fdirs=$($AWK '/^[fs]/ { print $3 }' $metadir/prototype.$secname | $SED -e 's,\(.*\)/.*$,\1,' | $SORT -u)
|
||||||
ddirs=$($AWK '/^d/ { print $3 }' $metadir/prototype.$secname | $SORT -u)
|
ddirs=$($AWK '/^d/ { print $3 }' $metadir/prototype.$secname | $SORT -u)
|
||||||
|
|
||||||
for i in $fdirs
|
for i in $fdirs
|
||||||
@ -713,7 +713,7 @@ parse_def()
|
|||||||
if [ "${line:0:4}" == "dir " ]; then
|
if [ "${line:0:4}" == "dir " ]; then
|
||||||
add_dir $defaultperms $defaultuid $defaultgid "${line:4}" $secname # Add dir entry
|
add_dir $defaultperms $defaultuid $defaultgid "${line:4}" $secname # Add dir entry
|
||||||
elif [ "${line:0:12}" = "default_docs" ]; then
|
elif [ "${line:0:12}" = "default_docs" ]; then
|
||||||
add_proto $defaultperms $defaultuid $defaultgid "${line:12}${_docdir}/${secname}-${version}" $secname # Add std. doc location
|
add_proto $defaultperms $defaultuid $defaultgid "${line:12}${metaprefix}${_docdir}/${secname}-${version}" $secname # Add std. doc location
|
||||||
else
|
else
|
||||||
add_proto $defaultperms $defaultuid $defaultgid "$line" $secname # Build protype file from filespec
|
add_proto $defaultperms $defaultuid $defaultgid "$line" $secname # Build protype file from filespec
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user