mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2026-09-24 23:40:32 +08:00
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.
This commit is contained in:
@@ -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 ;
|
||||
|
||||
Reference in New Issue
Block a user