summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/tools/ChangeLog4
-rw-r--r--doc/tools/configure.ac3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/tools/ChangeLog b/doc/tools/ChangeLog
index 42049a3777..7576c19d4e 100644
--- a/doc/tools/ChangeLog
+++ b/doc/tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Merger from rtems-4-6-branch.
+
2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use rtems-bugs@rtems.com as bug report email address.
diff --git a/doc/tools/configure.ac b/doc/tools/configure.ac
index acb145c01b..46029e60ad 100644
--- a/doc/tools/configure.ac
+++ b/doc/tools/configure.ac
@@ -4,8 +4,7 @@ AC_PREREQ(2.57)
AC_INIT([rtems-doc-tools],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
AC_CONFIG_SRCDIR([word-replace2])
-AC_CONFIG_AUX_DIR([../..])
-RTEMS_VERSIONING
+RTEMS_TOP([../..])
AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
dnl Checks for programs.