diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-10-01 23:21:51 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-10-01 23:21:51 +0000 |
| commit | c084f5b44e79ca314d000fb50416f37ca53844d0 (patch) | |
| tree | e911b8e688a67d4e63d50b22f546e0c03a9838c6 | |
| parent | 7aa673ed4fbe7df29459a116d451fc53bd1b590d (diff) | |
| download | gdb-c084f5b44e79ca314d000fb50416f37ca53844d0.zip gdb-c084f5b44e79ca314d000fb50416f37ca53844d0.tar.gz gdb-c084f5b44e79ca314d000fb50416f37ca53844d0.tar.bz2 | |
2002-10-01 Nathanael Nerode <neroden@gcc.gnu.org>
* configure: Finish reverting change which Andrew Cagney started
reverting. Should fix bustage.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | configure | 49 |
2 files changed, 28 insertions, 24 deletions
@@ -1,5 +1,8 @@ 2002-10-01 Nathanael Nerode <neroden@gcc.gnu.org> + * configure: Finish reverting change which Andrew Cagney started + reverting. Should fix bustage. + * src-release (BINUTILS_SUPPORT_DIRS): Add cpu directory. * src-release: New file. Contains material for making net releases for gdb, binutils, et al., formerly in Makefile.in. @@ -1364,21 +1364,21 @@ EOF rm -f ${subdir}/Makefile.tem mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem fi - 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}|" \ + 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}|" \ -e "/^CC[ ]*=/{ :loop1 /\\\\$/ N @@ -1407,19 +1407,20 @@ EOF t loop4 s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% }" \ - -e "s|@config_shell@|${config_shell}|" \ - -e "s|@srcdir@|${makesrcdir}|" \ + -e "s|^SHELL[ ]*=.*$|SHELL = ${config_shell}|" \ + -e "s|^srcdir[ ]*=.*$|srcdir = ${makesrcdir}|" \ -e "s/ //" \ - -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} + -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}:" \ - sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem mv -f ${Makefile}.tem ${Makefile} + sed -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem # If this is a Canadian Cross, preset the values of many more # tools. |