Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / configure.frag

diff --git a/gcc/configure.frag b/gcc/configure.frag
index f8c17dd..4bdac94 100644 (file)
--- a/gcc/configure.frag
+++ b/gcc/configure.frag
@@ -1,5 +1,5 @@
 # configure.frag for GNU CC
-# Process the Makefile fragments from language directories.
+# Process the host/target/language Makefile fragments.
 
 # Copyright (C) 1997 Free Software Foundation, Inc.
 
@@ -20,57 +20,58 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330,
 #Boston, MA 02111-1307, USA.
 
-rm -f Make-lang
-touch Make-lang
+# First parameter is the source directory, second is list of subdirectories,
+# third is list of host makefile fragments, fourth is list of target makefile
+# fragments.
+
+srcdir=$1
+subdirs=$2
+xmake_files=$3
+tmake_files=$4
+
+# Copy all the host makefile fragments into Make-host.
+
+rm -f Make-host
+touch Make-host
+for f in .. $xmake_files
+do
+       if [ -f $f ]
+       then
+               cat $f >> Make-host
+       fi
+done
+
+# Copy all the target makefile fragments into Make-target.
+
+rm -f Make-target
+touch Make-target
+for f in .. $tmake_files
+do
+       if [ -f $f ]
+       then
+               cat $f >> Make-target
+       fi
+done
 
-# First parameter is the source directory, second is list of subdirectories
-savesrcdir=$1
-savesubdirs=$2
-for subdir in . $savesubdirs
+# Ensure the language build subdirectories exist.
+
+for subdir in . $subdirs
 do
-       oldsrcdir=$savesrcdir
-
-       # 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
-
-       # If this is the top level Makefile, add the language fragments.
-       if [ $subdir = . ]
+       if [ $subdir != . ]
        then
-               for s in .. $savesubdirs
-               do
-                       if [ $s != ".." ]
-                       then
-                               cat ${mainsrcdir}/$s/Make-lang.in >> Make-lang
-                       fi
-               done
+               test -d $subdir || mkdir $subdir
        fi
+done
+
+# Now copy each language's Make-lang.in file to Make-lang.
 
-       cd $STARTDIR
-done   # end of current-dir SUBDIRS loop
+rm -f Make-lang
+touch Make-lang
 
-srcdir=$savesrcdir
+for subdir in . $subdirs
+do
+       if [ $subdir != . ]
+       then
+               cat $srcdir/$subdir/Make-lang.in >> Make-lang
+       fi
+done