* automake.in (&make_paragraphs): Transform BUILD, HOST and TARGET.

(&handle_tests_dejagnu, &define_standard_variables): Don't.
(&define_standard_variables): Don't transform %top_builddir% since...
* header-vars.am: Use %TOPDIR% instead.

diff --git a/ChangeLog b/ChangeLog
index 512fe824bcfc6532ccf6fa4412c3ce9d1375cd71..cb9bd236029f220bc6f2191f802c76c0b2838530 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-09  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&make_paragraphs): Transform BUILD, HOST and TARGET.
+       (&handle_tests_dejagnu, &define_standard_variables): Don't.
+       (&define_standard_variables): Don't transform %top_builddir% since...
+       * header-vars.am: Use %TOPDIR% instead.
+
 2001-05-09  Akim Demaille  <akim@epita.fr>
 
        * automake.in (@objects): Remove, unused.

diff --git a/automake.in b/automake.in
index df79ae57be3334cfb6d8df5cb58eba8b000def0f..142db33484d4e7a360bdbe379df95d88de453a48 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4256,11 +4256,7 @@ sub handle_tests_dejagnu
 
     # Only create site.exp rule if user hasn't already written one.
     $output_rules .=
-      &file_contents ('dejagnu',
-                     ('SITE-EXP' => ! &target_defined ('site.exp'),
-                      'BUILD'    => $seen_canonical == $AC_CANONICAL_SYSTEM,
-                      'HOST'     => $seen_canonical,
-                      'TARGET'   => $seen_canonical == $AC_CANONICAL_SYSTEM));
+      file_contents ('dejagnu', ('SITE-EXP' => ! target_defined ('site.exp')));
 }
 
 
@@ -6691,7 +6687,6 @@ sub read_am_file
        }
        elsif (/$ASSIGNMENT_PATTERN/o)
        {
-           # print STDERR;
            # Found a macro definition.
            $was_rule = 0;
            $last_var_name = $1;
@@ -6717,7 +6712,6 @@ sub read_am_file
                $var_comment{$last_var_name} .= "$comment";
                $comment = $spacing = '';
 
-               # print STDERR "$last_var_name => $last_var_value\n";
                macro_define ($last_var_name, 0,
                              $last_var_type, $cond,
                              $last_var_value, $.)
@@ -6782,11 +6776,7 @@ sub define_standard_variables
 {
     my $saved_output_vars = $output_vars;
     my ($comments, undef, $rules) =
-      &file_contents_internal (1, "$am_dir/header-vars.am",
-                    ('BUILD'    => $seen_canonical == $AC_CANONICAL_SYSTEM,
-                     'HOST'     => $seen_canonical,
-                     'TARGET'   => $seen_canonical == $AC_CANONICAL_SYSTEM,
-                     'top_builddir' => backname ($relative_dir)));
+      file_contents_internal (1, "$am_dir/header-vars.am");
 
     # This will output the definitions in $output_vars, which we don't
     # want...
@@ -6898,6 +6888,10 @@ sub make_paragraphs ($%)
                     'TOPDIR_P'     => $relative_dir eq '.',
                     'CONFIGURE-AC' => $configure_ac,
 
+                    'BUILD'    => $seen_canonical == $AC_CANONICAL_SYSTEM,
+                    'HOST'     => $seen_canonical,
+                    'TARGET'   => $seen_canonical == $AC_CANONICAL_SYSTEM,
+
                     'LIBTOOL'      => defined $configure_vars{'LIBTOOL'})
          # We don't need more than two consecutive new-lines.
          . 's/\n{3,}/\n\n/g';
@@ -7078,7 +7072,7 @@ sub file_contents_internal ($$%)
        {
            my ($var, $type, $val) = ($1, $2, $3);
            &am_file_error ($file, "macro `$var' with trailing backslash")
-             if /\\$/;;
+             if /\\$/;
 
            # Accumulating variables must not be output.
            $var_comment{$var} .= "$spacing"

diff --git a/header-vars.am b/header-vars.am
index 5b965c742b584b6fd98d9f9dc1f99101589a72cf..1e091465a34f9955b2e72b2a39f6b8d64ba1523e 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -53,7 +53,7 @@ pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
 ## Location of top build directory relative to this one.
-top_builddir = %top_builddir%
+top_builddir = %TOPDIR%
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 5b965c742b584b6fd98d9f9dc1f99101589a72cf..1e091465a34f9955b2e72b2a39f6b8d64ba1523e 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -53,7 +53,7 @@ pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
 ## Location of top build directory relative to this one.
-top_builddir = %top_builddir%
+top_builddir = %TOPDIR%
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@