6 files changed, 18 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fe699d8831..01484b9ee9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac:
+	AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
+	AM_INIT_AUTOMAKE([no-define foreign 1.6]).
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+
 2001-02-14	Joel Sherrill <joel@OARcorp.com>
 
 	* configure.ac: New mips supplement.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09ebca9708..bbeabdc79e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,6 @@
 #  $Id$
 #
 
-AUTOMAKE_OPTIONS = foreign 1.5
 
 # NOTE: The order of the directories is essential.
 #       + tools, common and images are shared across many documents
diff --git a/doc/configure.ac b/doc/configure.ac
index 45dd49d907..4491b6a07c 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -2,13 +2,13 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT
+AC_INIT([rtems-doc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([project.am])
 AC_CONFIG_AUX_DIR([.])
 
 RTEMS_VERSION=Snapshot
 
-AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
 AM_MAINTAINER_MODE
 
 AC_ARG_ENABLE(html,
diff --git a/doc/tools/ChangeLog b/doc/tools/ChangeLog
index f72b666845..5f9072c369 100644
--- a/doc/tools/ChangeLog
+++ b/doc/tools/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac:
+	AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
+	AM_INIT_AUTOMAKE([no-define foreign 1.6]).
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+
 2002-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Autoupdate to 2.52. 
diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
index a634a5de7b..55b8c362ba 100644
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -1,6 +1,5 @@
 ## $Id$
 
-AUTOMAKE_OPTIONS = foreign 1.5
 
 EXTRA_DIST = word-replace2
 
diff --git a/doc/tools/configure.ac b/doc/tools/configure.ac
index 3a2d0068ef..a52d8a3b21 100644
--- a/doc/tools/configure.ac
+++ b/doc/tools/configure.ac
@@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 dnl NOTE: This is a very coarse port to automake
 AC_PREREQ(2.52)
 
-AC_INIT
+AC_INIT([rtems-doc-tools],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([word-replace2])
 
-AM_INIT_AUTOMAKE(rtemsdoc-tools,0.0.0,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
 dnl Checks for programs.
 AC_PROG_CC