Rewrite.

From-SVN: r14360

diff --git a/gcc/configure.frag b/gcc/configure.frag
index 56a47fc51894a8957d6aadf4ce739ca39a1137a1..7eb2f40c93024f19d4818f25b0c2040068051581 100644 (file)
--- a/gcc/configure.frag
+++ b/gcc/configure.frag
@@ -21,56 +21,29 @@
 #Boston, MA 02111-1307, USA.
 
 # First parameter is the source directory, second is list of subdirectories
+
 savesrcdir=$1
 savesubdirs=$2
+
+# First ensure the language build subdirectories exist.
+
 for subdir in . $savesubdirs
 do
-       oldsrcdir=$savesrcdir
+       if [ $subdir != . ]
+       then
+               test -d $subdir || mkdir $subdir
+       fi
+done
 
-       rm -f Make-lang
-       touch Make-lang
+# Now copy each language's Make-lang.in file to Make-lang.
 
-       # Re-adjust the path
-       case $oldsrcdir in
-       /*)
-               case $subdir in
-               .)
-                       srcdir=$oldsrcdir
-                       ;;
-               *)
-                       srcdir=$oldsrcdir/$subdir
-                       ;;
-               esac
-               ;;
-       *)
-               case $subdir in
-               .)
-                       ;;
-               *)
-                       oldsrcdir=../${oldsrcdir}
-                       srcdir=$oldsrcdir/$subdir
-                       ;;
-               esac
-               ;;
-       esac
-       mainsrcdir=$oldsrcdir
-       STARTDIR=`pwd`
-       test -d $subdir || mkdir $subdir
-       cd $subdir
+rm -f Make-lang
+touch Make-lang
 
-       # If this is the top level Makefile, add the language fragments.
-       if [ $subdir = . ]
+for subdir in . $savesubdirs
+do
+       if [ $subdir != . ]
        then
-               for s in .. $savesubdirs
-               do
-                       if [ $s != ".." ]
-                       then
-                               cat ${mainsrcdir}/$s/Make-lang.in >> Make-lang
-                       fi
-               done
+               cat $savesrcdir/$subdir/Make-lang.in >> Make-lang
        fi
-
-       cd $STARTDIR
-done   # end of current-dir SUBDIRS loop
-
-srcdir=$savesrcdir
+done