summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-14 17:15:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-14 17:15:18 +0000
commitec6968b1c425d01f52a9e9f4e2dd442e3172c594 (patch)
treec246927be7dbcaf62899d2ef33ac11bc11a02277 /bootstrap
parentc63a5cfe572cb016ef681d8b4404e007e1e122ab (diff)
downloadrtems-ec6968b1c425d01f52a9e9f4e2dd442e3172c594.tar.bz2
Patch rtems-rc-20000614-2-cvs.diff from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> to evaluate ACLOCAL_AMFLAGS in Makefile.ams before running aclocal. Remark: This patch is in preparation to switching to Cygnus/GNU canonicalization. I plan to introduce to an alternate aclocal macros directory which shall contain Cygnus/GNU conforming macros only, soon.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap10
1 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap b/bootstrap
index b0af7ca9ec..0e02042d24 100755
--- a/bootstrap
+++ b/bootstrap
@@ -63,9 +63,9 @@ case $mode in
generate)
case $top_srcdir in
- /* ) aclocal_dir=$top_srcdir/aclocal
+ /* ) aclocal_dir=$top_srcdir
;;
- *) aclocal_dir=`pwd`/$top_srcdir/aclocal
+ *) aclocal_dir=`pwd`/$top_srcdir
;;
esac
@@ -74,7 +74,11 @@ generate)
dir=`dirname $i`;
( test "$quiet" = "true" || echo "$dir";
cd $dir;
- aclocal -I $aclocal_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;
autoconf;
test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
test -f Makefile.am && automake $verbose ;