Changeset ec6968b in rtems

Timestamp:

06/14/00 17:15:18 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

6f93bb4

Parents:

c63a5cf

Message:

Patch rtems-rc-20000614-2-cvs.diff from Ralf Corsepius
<corsepiu@…> 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.

File:

• bootstrap (modified) (2 diffs)

bootstrap

@@ -64 +64 @@
 
   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
@@ -75 +75 @@
   ( 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 ;