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.
# 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)')
}
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 '.')