From 94795bbda62c8c6a2d6febb87a67230c21b17e9d Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 22 Mar 2000 14:04:02 +0000
Subject: [PATCH] Patch rtems-rc-4.5.0-5-cvs.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that allows bootstrap to be run from
 subdirectories.

---
 bootstrap                    | 18 +++++++++++++-----
 tools/update/acpolish        |  2 +-
 tools/update/rtems-polish.sh |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bootstrap b/bootstrap
index 24470802e7..c06dc86d06 100755
--- a/bootstrap
+++ b/bootstrap
@@ -13,6 +13,8 @@
 # source tree
 
 progname=`basename $0`
+top_srcdir=`dirname $0`
+
 verbose="";
 quiet="false"
 mode="generate"
@@ -31,9 +33,9 @@ usage()
   exit 1;
 }
 
-if test ! -f VERSION; then
+if test ! -f $top_srcdir/VERSION; then
   echo "${progname}:"
-  echo "	Please change directory to RTEMS's toplevel directory"
+  echo "	Installation problem: Can't find file VERSION"
   exit 1;
 fi
 
@@ -57,12 +59,17 @@ case $1 in
 esac
 done
 
-pwd=`pwd`;
-
 case $mode in
 generate)
+
+  case $top_srcdir in
+  /* ) aclocal_dir=$top_srcdir/aclocal
+    ;;
+  *) aclocal_dir=`pwd`/$top_srcdir/aclocal
+    ;;
+  esac
+
   confs=`find . -name 'configure.in' -print`
-  aclocal_dir=$pwd/aclocal
   for i in $confs; do
   dir=`dirname $i`;
   ( test "$quiet" = "true" || echo "$dir";
@@ -76,6 +83,7 @@ generate)
   )
   done
   ;;
+
 clean)
   test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
   files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
diff --git a/tools/update/acpolish b/tools/update/acpolish
index 8418acdd05..0a739fd9cf 100755
--- a/tools/update/acpolish
+++ b/tools/update/acpolish
@@ -191,7 +191,7 @@ sub subst_line
   my @ibuf = () ;
   my $line = "" ;
 
-  while ( <> )
+  while ( <STDIN> )
   {
     &subst_line ;
     if ( /^(#.*)$/o )
diff --git a/tools/update/rtems-polish.sh b/tools/update/rtems-polish.sh
index 83e3d0e390..df0cc8a0e7 100755
--- a/tools/update/rtems-polish.sh
+++ b/tools/update/rtems-polish.sh
@@ -37,7 +37,7 @@ usage()
   exit 1;
 }
 
-# Check for auxillary files
+# Check for auxiliary files
 aux_files="../../VERSION ampolish acpolish cipolish"
 for i in ${aux_files}; do
   if test ! -f ${perltools}/$i; then