This commit was manufactured by cvs2svn to create branch 'drow-cplus-drow-cplus-branchpoint

branch'.

Sprout from carlton_dictionary-branch 2002-09-20 00:21:59 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2002-10-03 19:08:53 UTC Nathanael Nerode <neroden@gcc.gnu.org> '2002-10-03  Nathanael Nerode  <neroden@gcc.gnu.org>':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    configure
    configure.in
    include/ChangeLog
    include/elf/ChangeLog
    include/elf/mips.h
    include/elf/x86-64.h
    include/opcode/ChangeLog
    include/opcode/mips.h
    src-release
Delete:
    include/regs/ChangeLog

1 files changed, 25 insertions, 28 deletions

diff --git a/configure b/configure
index 339b23d3e..ec9bebf50 100755
--- a/configure
+++ b/configure
@@ -1356,8 +1356,7 @@ EOF
                 rm -f ${subdir}/Makefile.tm2
                 sedtemp=sed.$$
                 cat >$sedtemp <<EOF
-s:^SUBDIRS[ 	]*=.*$:SUBDIRS = ${configdirs}:
-s:^NONSUBDIRS[ 	]*=.*$:NONSUBDIRS = ${noconfigdirs}:
+s:@configdirs@:${configdirs}:
 EOF
                 sed -f $sedtemp \
                     ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
@@ -1365,21 +1364,21 @@ EOF
                 rm -f ${subdir}/Makefile.tem
                 mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem
 	    fi
-	    sed     -e "s|^prefix[ 	]*=.*$|prefix = ${prefix}|" \
-                    -e "s|^exec_prefix[ 	]*=.*$|exec_prefix = ${exec_prefix}|" \
-                    -e "s|^bindir[ 	]*=.*$|bindir = ${bindir}|" \
-                    -e "s|^sbindir[ 	]*=.*$|sbindir = ${sbindir}|" \
-                    -e "s|^libexecdir[ 	]*=.*$|libexecdir = ${libexecdir}|" \
-                    -e "s|^datadir[ 	]*=.*$|datadir = ${datadir}|" \
-                    -e "s|^sysconfdir[ 	]*=.*$|sysconfdir = ${sysconfdir}|" \
-                    -e "s|^sharedstatedir[ 	]*=.*$|sharedstatedir = ${sharedstatedir}|" \
-                    -e "s|^localstatedir[ 	]*=.*$|localstatedir = ${localstatedir}|" \
-                    -e "s|^libdir[ 	]*=.*$|libdir = ${libdir}|" \
-                    -e "s|^includedir[ 	]*=.*$|includedir = ${includedir}|" \
-                    -e "s|^oldincludedir[ 	]*=.*$|oldincludedir = ${oldincludedir}|" \
-                    -e "s|^infodir[ 	]*=.*$|infodir = ${infodir}|" \
-                    -e "s|^mandir[ 	]*=.*$|mandir = ${mandir}|" \
-		    -e "s|^ALL_BUILD_MODULES =.*|ALL_BUILD_MODULES =${all_build_modules}|" \
+	    sed     -e "s|@prefix@|${prefix}|" \
+                    -e "s|@exec_prefix@|${exec_prefix}|" \
+                    -e "s|@bindir@|${bindir}|" \
+                    -e "s|@sbindir@|${sbindir}|" \
+                    -e "s|@libexecdir@|${libexecdir}|" \
+                    -e "s|@datadir@|${datadir}|" \
+                    -e "s|@sysconfdir@|${sysconfdir}|" \
+                    -e "s|@sharedstatedir@|${sharedstatedir}|" \
+                    -e "s|@localstatedir@|${localstatedir}|" \
+                    -e "s|@libdir@|${libdir}|" \
+                    -e "s|@includedir@|${includedir}|" \
+                    -e "s|@oldincludedir@|${oldincludedir}|" \
+                    -e "s|@infodir@|${infodir}|" \
+                    -e "s|@mandir@|${mandir}|" \
+		    -e "s|@all_build_modules@|${all_build_modules}|" \
 		    -e "/^CC[ 	]*=/{
 			:loop1
 			/\\\\$/ N
@@ -1408,20 +1407,18 @@ EOF
 			t loop4
 			s%^CXXFLAGS[ 	]*=.*$%CXXFLAGS = ${CXXFLAGS}%
 			}" \
-		    -e "s|^SHELL[	 ]*=.*$|SHELL = ${config_shell}|" \
-                    -e "s|^srcdir[ 	]*=.*$|srcdir = ${makesrcdir}|" \
+		    -e "s|@config_shell@|${config_shell}|" \
+                    -e "s|@srcdir@|${makesrcdir}|" \
                     -e "s///" \
-                    -e "s:^program_prefix[ 	]*=.*$:program_prefix = ${program_prefix}:" \
-                    -e "s:^program_suffix[ 	]*=.*$:program_suffix = ${program_suffix}:" \
-                    -e "s:^program_transform_name[ 	]*=.*$:program_transform_name = ${program_transform_name}:" \
-                    -e "s|^tooldir[ 	]*=.*$|tooldir = ${tooldir}|" \
-                    -e "s|^build_tooldir[ 	]*=.*$|build_tooldir = ${tooldir}|" \
-		    -e "s:^DEFAULT_YACC[	 ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \
-		    -e "s:^DEFAULT_LEX[	 ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \
-		    -e "s:^DEFAULT_M4[  ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \
+                    -e "s:@program_transform_name@:${program_transform_name}:" \
+                    -e "s|@tooldir@|${tooldir}|" \
+                    -e "s|@build_tooldir@|${tooldir}|" \
+		    -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \
+		    -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \
+		    -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \
                     ${subdir}/Makefile.tem >> ${Makefile}
   
-	    sed -e "s:^GDB_TK[	 ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem
+	    sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem
 	    mv -f ${Makefile}.tem ${Makefile}
 
 	    # If this is a Canadian Cross, preset the values of many more