* automake.in (generate_makefile): Define `subdir' variable.

	(handle_dist): Don't define `subdir'.

diff --git a/ChangeLog b/ChangeLog
index 1140866873b253b2358a4bb57d85a1889d2a6506..ab20bee58a6aa3b599f0151a0d92f33cd2da4b65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-22  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (generate_makefile): Define `subdir' variable.
+       (handle_dist): Don't define `subdir'.
+
        * automake.in (handle_texinfo): Change numbering scheme for
        stamp-vti files, to avoid problems with DOS.
        From Michel de Ruiter.

diff --git a/automake.in b/automake.in
index 9a9fbbfe2e0f78a9546263b2f2db75d8ee6a0713..cf9439cf0e33002a8fb1daf14d7b97ef4fad804a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -602,6 +602,8 @@ sub generate_makefile
        # the generated makefile.
        &push_dist_common ($in_file_name, $am_file_name);
     }
+    &define_variable ('subdir', $relative_dir);
+
     push (@sources, '$(SOURCES)')
        if &variable_defined ('SOURCES');
     push (@objects, '$(OBJECTS)')
@@ -2660,12 +2662,9 @@ sub handle_dist
     }
     if ($relative_dir eq '.')
     {
-       $output_rules .= "top_distdir = \$(distdir)\n\n";
-    }
-    else
-    {
-       $output_rules .= "\nsubdir = " . $relative_dir . "\n\n";
+       $output_rules .= "top_distdir = \$(distdir)\n";
     }
+    $output_rules .= "\n";
 
     # Generate 'dist' target, and maybe other dist targets.
     if ($relative_dir eq '.')