diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-10 14:26:48 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-10 14:26:48 +0000 |
commit | ff11b0147a4a7fa769b5a6bb6686734a621c0c34 (patch) | |
tree | 2224dedb19d9da24d1602abd6d15c386302bdd93 | |
parent | 2000-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-ff11b0147a4a7fa769b5a6bb6686734a621c0c34.tar.bz2 |
2000-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ampolish: Generate ACLOCAL_AMFLAGS = -I .../aclocal.
-rw-r--r-- | tools/update/ChangeLog | 4 | ||||
-rwxr-xr-x | tools/update/ampolish | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/update/ChangeLog b/tools/update/ChangeLog index 4c62666d27..41205acf14 100644 --- a/tools/update/ChangeLog +++ b/tools/update/ChangeLog @@ -1,3 +1,7 @@ +2000-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * ampolish: Generate ACLOCAL_AMFLAGS = -I .../aclocal. + 2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/tools/update/ampolish b/tools/update/ampolish index af267e8bb9..142be1d671 100755 --- a/tools/update/ampolish +++ b/tools/update/ampolish @@ -101,8 +101,6 @@ else { $rtems_top .= "/" ; } foreach ( @buffer ) { -# tr /\{\}/\(\)/ ; - if ( /^(TMP|PRE)INSTALL_FILES[\s]*=(.*)$/o ) { # force "+=" push @ibuf, "$1INSTALL_FILES +=$2\n" ; @@ -150,8 +148,6 @@ else { $rtems_top .= "/" ; } @buffer = @ibuf ; } -# print STDERR "<tmp>\n", @buffer, "</tmp>\n" ; - { my @ibuf = () ; foreach ( @buffer ) @@ -296,7 +292,7 @@ foreach( @vars ) push @ibuf, "\nAUTOMAKE_OPTIONS = @{$l}\n" ; if ( "$rtems_cfg" eq "." ) { - push @ibuf, "ACLOCAL_AMFLAGS = -I \$(RTEMS_TOPdir)/aclocal\n" ; + push @ibuf, "ACLOCAL_AMFLAGS = -I ${rtems_top}aclocal\n" ; } if ( defined( @{$var_{"\$(VPATH)"}} ) ) { |