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

accidentally converting it to /../.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@6113 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fixinc.dgux b/gcc/fixinc.dgux
index 6a7b1a5..7a73456 100755 (executable)
--- a/gcc/fixinc.dgux
+++ b/gcc/fixinc.dgux
@@ -107,7 +107,7 @@ if $LINKS; then
          y=`echo $x | sed -n "s&${INPUT}/&&p"`
          # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
          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'
          rm -fr ${LIB}/$file > /dev/null 2>&1
          ln -s $dots$y ${LIB}/$file > /dev/null 2>&1

diff --git a/gcc/fixinc.svr4 b/gcc/fixinc.svr4
index abc0fef..8a756b2 100755 (executable)
--- a/gcc/fixinc.svr4
+++ b/gcc/fixinc.svr4
@@ -115,7 +115,7 @@ if $LINKS; then
          y=`echo $x | sed -n "s&${INPUT}/&&p"`
          # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
          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'
          rm -fr ${LIB}/$file > /dev/null 2>&1
          ln -s $dots$y ${LIB}/$file > /dev/null 2>&1

diff --git a/gcc/fixincludes b/gcc/fixincludes
index c1b84cc..30f3388 100755 (executable)
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -169,7 +169,7 @@ if $LINKS; then
          y=`echo $x | sed -n "s&${INPUT}/&&p"`
          # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
          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'
          rm -fr ${LIB}/$file > /dev/null 2>&1
          ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
@@ -212,7 +212,7 @@ if $LINKS; then
           done
          # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
          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
          ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1
          treetops="$treetops $x ${LIB}/root$x"