From b81ee5bac2d25774030b1c2ef9498aa739f2b0f5 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 22 Apr 1999 22:09:32 +0000
Subject: [PATCH] 	* automake.in (generate_makefile): Define `subdir'
 variable. 	(handle_dist): Don't define `subdir'.

---
 ChangeLog   | 3 +++
 automake.in | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 11408668..ab20bee5 100644
--- 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 9a9fbbfe..cf9439cf 100755
--- 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 '.')
-- 
2.43.5