5 files changed, 13 insertions, 144 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 01484b9ee9..d4a521fb1f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootstrap: Remove.
+	* VERSION: Remove.
+	* Makefile.am: 
+	Remove bootstrap.
+	Add ACLOCAL_AMFLAGS.
+	* configure.ac: Add RTEMS_TOP.
+
 2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bbeabdc79e..3e90933fba 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,7 @@
 #  $Id$
 #
 
+ACLOCAL_AMFLAGS = -I ../aclocal
 
 # NOTE: The order of the directories is essential.
 #       + tools, common and images are shared across many documents
@@ -17,8 +18,6 @@ endif
 
 AUTOMAKE_FILES = project.am main.am
 
-noinst_SCRIPTS = bootstrap
-
 EXTRA_DIST = $(AUTOMAKE_FILES) HELP.html \
-    $(noinst_SCRIPTS) rtems_header.html.in rtems_footer.html.in
+    rtems_header.html.in rtems_footer.html.in
 
diff --git a/doc/VERSION b/doc/VERSION
index 176d20bf39..e69de29bb2 100644
--- a/doc/VERSION
+++ b/doc/VERSION
@@ -1,7 +0,0 @@
-#
-#  This file is automatically generated -- DO NOT EDIT!!!
-#
-#  $Id$
-#
-
-RTEMS Documentation Version ss-20010117
diff --git a/doc/bootstrap b/doc/bootstrap
index 1841875c2f..e69de29bb2 100755
--- a/doc/bootstrap
+++ b/doc/bootstrap
@@ -1,131 +0,0 @@
-#!/bin/sh
-#
-# helps bootstrapping, when checked out from CVS
-# requires GNU autoconf and GNU automake
-#
-# $Id$
-
-# this is not meant to be exported outside the source tree
-
-# NOTE: Inspired by libtool's autogen script
-
-# to be run from the toplevel directory of RTEMS'
-# source tree
-
-progname=`basename $0`
-top_srcdir=`dirname $0`
-
-verbose="";
-quiet="false"
-mode="generate"
-
-usage()
-{
-  echo
-  echo "usage: ${progname} [-h|-q|-v]"
-  echo
-  echo "options:"
-  echo "	-h .. display this message and exit";
-  echo "	-q .. quiet, don't display directories";
-  echo "	-v .. verbose, pass -v to automake when invoking automake"
-  echo "	-c .. clean, remove all aclocal/autoconf/automake generated files"
-  echo
-  exit 1;
-}
-
-if test ! -f $top_srcdir/VERSION; then
-  echo "${progname}:"
-  echo "	Installation problem: Can't find file VERSION"
-  exit 1;
-fi
-
-while test $# -gt 0; do
-case $1 in
--h|--he|--hel|--help)
-  usage ;;
--q|--qu|--qui|--quie|--quiet)
-  quiet="true";
-  shift;;
--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
-  verbose="-v";
-  shift;;
--c|--cl|--cle|--clea|--clean)
-  mode="clean";
-  shift;;
--*) echo "unknown option $1" ;
-  usage ;;
-*) echo "invalid parameter $1" ;
-  usage ;;
-esac
-done
-
-case $mode in
-generate)
-
-  case $top_srcdir in
-  /* ) aclocal_dir=$top_srcdir
-    ;;
-  *) aclocal_dir=`pwd`/$top_srcdir
-    ;;
-  esac
-
-  confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
-  for i in $confs; do
-  dir=`dirname $i`;
-  configure=`basename $i`;
-  ( test "$quiet" = "true" || echo "$dir";
-    cd $dir;
-    pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
-    aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
-      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
-    test "$verbose" = "-v" && echo "aclocal $aclocal_args"
-    aclocal $aclocal_args;
-    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \
-      && test "$verbose" = "-v" && echo "autoheader";
-    test -f Makefile.am && automake -a -c $verbose ;
-    autoconf;
-    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
-      && echo timestamp > stamp-h.in
-  )
-  done
-  ;;
-
-clean)
-  test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
-  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
-  for i in $files; do if test -f $i; then
-    rm -f $i
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
-
-  test "$quiet" = "true" || echo "removing configure files"
-  files=`find . -name 'configure' -print` ;
-  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
-  for i in $files; do if test -f $i; then
-    rm -f $i config.guess config.sub depcomp install-sh mdate-sh missing mkinstalldirs
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
-  
-  test "$quiet" = "true" || echo "removing aclocal.m4 files"
-  files=`find . -name 'aclocal.m4' -print` ;
-  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
-  for i in $files; do if test -f $i; then
-    rm -f $i
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
-
-  find . -name '*~' -print | xargs rm -f
-  find . -name 'bspopts.h*' -print | xargs rm -f
-  find . -name '*.orig' -print | xargs rm -f
-  find . -name '*.rej' -print | xargs rm -f
-  find . -name 'config.status' -print | xargs rm -f
-  find . -name 'config.log' -print | xargs rm -f
-  find . -name 'config.cache' -print | xargs rm -f
-  find . -name 'Makefile' -print | xargs rm -f
-  find . -name '.deps' -print | xargs rm -rf
-  find . -name '.libs' -print | xargs rm -rf
-  find . -name 'stamp-h.in' | xargs rm -rf
-  ;;
-esac
diff --git a/doc/configure.ac b/doc/configure.ac
index 4491b6a07c..975ffa22cd 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -4,9 +4,8 @@ AC_PREREQ(2.52)
 
 AC_INIT([rtems-doc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([project.am])
-AC_CONFIG_AUX_DIR([.])
-
-RTEMS_VERSION=Snapshot
+RTEMS_TOP([..])
+AC_CONFIG_AUX_DIR([..])
 
 AM_INIT_AUTOMAKE([no-define foreign 1.6])
 AM_MAINTAINER_MODE