summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2007-01-15 07:24:01 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2007-01-15 07:24:01 +0000
commitab355bbc26fc43f909d09790fa93a77f81a287eb (patch)
tree173d8ef5cace621e8061a68dda4f1276931e6949 /doc
parent2007-01-15 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-ab355bbc26fc43f909d09790fa93a77f81a287eb.tar.bz2
2007-01-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Reflect having moved setup.def. Eliminate gcc3*.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog2
-rw-r--r--doc/configure.ac22
2 files changed, 13 insertions, 11 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e0d3c6ddc6..2ea45fa50b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,7 @@
2007-01-15 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * configure.ac: Reflect having moved setup.def.
+ Eliminate gcc3*.
* setup.def: New (Formerly in ../scripts).
2006-12-20 Joel Sherrill <joel@OARcorp.com>
diff --git a/doc/configure.ac b/doc/configure.ac
index 9b69c7ffa7..203228ea62 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -137,9 +137,9 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_MSG_CHECKING([for ../scripts/setup.def])
-AS_IF([test -f ${srcdir}/../scripts/setup.def],[
-. ${srcdir}/../scripts/setup.def
+AC_MSG_CHECKING([for ./setup.def])
+AS_IF([test -f ${srcdir}/setup.def],[
+. ${srcdir}/setup.def
AC_MSG_RESULT([done])
],[
AC_MSG_ERROR([missing])
@@ -149,13 +149,13 @@ AS_IF([test -z "$binutils_patch_version"],
[set_binutils_patch="@clear BINUTILSPATCHVERSION"],
[set_binutils_patch="@set BINUTILSPATCHVERSION $binutils_patch_version"])
-AS_IF([test -z "$gcc3newlib_patch_version"],
+AS_IF([test -z "$newlib_patch_version"],
[set_newlib_patch="@clear NEWLIBPATCHVERSION"],
-[set_newlib_patch="@set NEWLIBPATCHVERSION $gcc3newlib_patch_version"])
+[set_newlib_patch="@set NEWLIBPATCHVERSION $newlib_patch_version"])
-AS_IF([test -z "$gcc3_patch_version"],
-[set_gcc3_patch="@clear GCCPATCHVERSION"],
-[set_gcc_patch="@set GCCPATCHVERSION $gcc3_patch_version"])
+AS_IF([test -z "$gcc_patch_version"],
+[set_gcc_patch="@clear GCCPATCHVERSION"],
+[set_gcc_patch="@set GCCPATCHVERSION $gcc_patch_version"])
AS_IF([test -z "$gdb_patch_version"],
[set_gdb_patch="@clear GDBPATCHVERSION"],
@@ -185,15 +185,15 @@ AC_CONFIG_FILES([started/Makefile],[],[
test -d started || mkdir started
cat << EOF > started/tversions.sed~
:t
-s/@GCCVERSION@/$gcc3_version/;t t
+s/@GCCVERSION@/$gcc_version/;t t
s/@BINUTILSVERSION@/$binutils_version/;t t
-s/@NEWLIBVERSION@/$gcc3newlib_version/;t t
+s/@NEWLIBVERSION@/$newlib_version/;t t
s/@GDBVERSION@/$gdb_version/;t t
s/@SETBINUTILSPATCHVERSION@/$set_binutils_patch/;t t
s/@SETGCCPATCHVERSION@/$set_gcc_patch/;t t
s/@SETNEWLIBPATCHVERSION@/$set_newlib_patch/;t t
s/@SETGDBPATCHVERSION@/$set_gdb_patch/;t t
-s/@GCCRPMRELEASE@/$gcc3newlib_rpm_release/;t t
+s/@GCCRPMRELEASE@/$gccnewlib_rpm_release/;t t
s/@BINUTILSRPMRELEASE@/$binutils_rpm_release/;t t
s/@GDBRPMRELEASE@/$gdb_rpm_release/;t t
EOF