Simplify base/section rules, patch from David R Boldt

This commit is contained in:
Love Hornquist Astrand
2011-09-29 13:51:27 +02:00
parent 1de3db5678
commit 240b298e61

View File

@@ -14,8 +14,8 @@ catinstall="${INSTALL_CATPAGES-yes}"
for f in "$@"; do for f in "$@"; do
echo $f echo $f
base=`echo "$f" | sed 's/\([^/]*\/\)*\(.*\)\.\([^.]*\)$/\2/'` base=`echo "$f" | sed 's/\.[^.]*$//'`
section=`echo "$f" | sed 's/\([^/]*\/\)*\(.*\)\.\([^.]*\)$/\3/'` section=`echo "$f" | sed 's/^[^.]*\.//'`
mandir="$manbase/man$section" mandir="$manbase/man$section"
catdir="$manbase/cat$section" catdir="$manbase/cat$section"
c="$base.cat$section" c="$base.cat$section"
@@ -48,10 +48,11 @@ for f in "$@"; do
fi fi
done done
if test "$catinstall" = yes -a -f "$srcdir/$c"; then if test "$catinstall" = yes -a -f "$srcdir/$c"; then
target="$catdir/$link.$suffix" eval target="$catdir/$link.$suffix"
for lncmd in "ln -f $catdir/$base.$suffix $target" \ eval source="$catdir/$base.$suffix"
"ln -fs $base.$suffix $target" \ for lncmd in "ln -f $source $target" \
"cp -f $catdir/$base.$suffix $target" "ln -fs $source $target" \
"cp -f $catdir/$source $target"
do do
if eval "$lncmd"; then if eval "$lncmd"; then
eval echo "$lncmd" eval echo "$lncmd"