Handle a symlink to root/* from a subdirectory of a symlink to root/*

From-SVN: r8097

diff --git a/gcc/fixincludes b/gcc/fixincludes
index 2e33da5181d8f8b548f2369612d09a0180b96165..eba13afa2a87267c71946ae859a4ecfe0091628d 100755 (executable)
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -198,9 +198,12 @@ if $LINKS; then
                ;;
            esac
           done
+         # Get the path from ${LIB} to $file, accounting for symlinks.
+         parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
+         libabs=`cd ${LIB}; ${PWDCMD}`
+         file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
          # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
-         dots=`echo "$file" |
-           sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+         dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
          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"