Commit e5c1a9d2 by Richard Stallman

When compute DOTS, convert /./ to / to avoid

accidentally converting it to /../.

From-SVN: r6113
parent c3c12186
...@@ -107,7 +107,7 @@ if $LINKS; then ...@@ -107,7 +107,7 @@ if $LINKS; then
y=`echo $x | sed -n "s&${INPUT}/&&p"` y=`echo $x | sed -n "s&${INPUT}/&&p"`
# DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
dots=`echo "$file" | dots=`echo "$file" |
sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
echo $file '->' $dots$y ': Making link' echo $file '->' $dots$y ': Making link'
rm -fr ${LIB}/$file > /dev/null 2>&1 rm -fr ${LIB}/$file > /dev/null 2>&1
ln -s $dots$y ${LIB}/$file > /dev/null 2>&1 ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
......
...@@ -115,7 +115,7 @@ if $LINKS; then ...@@ -115,7 +115,7 @@ if $LINKS; then
y=`echo $x | sed -n "s&${INPUT}/&&p"` y=`echo $x | sed -n "s&${INPUT}/&&p"`
# DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
dots=`echo "$file" | dots=`echo "$file" |
sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
echo $file '->' $dots$y ': Making link' echo $file '->' $dots$y ': Making link'
rm -fr ${LIB}/$file > /dev/null 2>&1 rm -fr ${LIB}/$file > /dev/null 2>&1
ln -s $dots$y ${LIB}/$file > /dev/null 2>&1 ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
......
...@@ -169,7 +169,7 @@ if $LINKS; then ...@@ -169,7 +169,7 @@ if $LINKS; then
y=`echo $x | sed -n "s&${INPUT}/&&p"` y=`echo $x | sed -n "s&${INPUT}/&&p"`
# DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
dots=`echo "$file" | dots=`echo "$file" |
sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
echo $file '->' $dots$y ': Making link' echo $file '->' $dots$y ': Making link'
rm -fr ${LIB}/$file > /dev/null 2>&1 rm -fr ${LIB}/$file > /dev/null 2>&1
ln -s $dots$y ${LIB}/$file > /dev/null 2>&1 ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
...@@ -212,7 +212,7 @@ if $LINKS; then ...@@ -212,7 +212,7 @@ if $LINKS; then
done done
# DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}. # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
dots=`echo "$file" | dots=`echo "$file" |
sed -e 's@^./@@' -e 's@[^/][^/]*@..@g' -e 's@..$@@'` sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
rm -fr ${LIB}/$file > /dev/null 2>&1 rm -fr ${LIB}/$file > /dev/null 2>&1
ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1 ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1
treetops="$treetops $x ${LIB}/root$x" treetops="$treetops $x ${LIB}/root$x"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment