From 5929339c1c3b95aeb1f66b57a5d2f08fdfcd3e74 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 17 Jul 2004 10:52:19 +0000 Subject: [PATCH] * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now that it is always defined. This is less confusing for users reading the generated Makefiles. * automake.in (handle_dist): Do not substitute DIST_SUBDIR_NAME. --- ChangeLog | 5 +++++ automake.in | 7 +------ lib/am/distdir.am | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cc0f3a38..5771b5d67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-07-17 Alexandre Duret-Lutz + * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now + that it is always defined. This is less confusing for users + reading the generated Makefiles. + * automake.in (handle_dist): Do not substitute DIST_SUBDIR_NAME. + * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html, ?!GENERIC?%DEST_PREFIX%.html): Output .htp, and then rename to .html on success. In case the target is a directory, this ensures its diff --git a/automake.in b/automake.in index 186af6e65..95bc7a38a 100755 --- a/automake.in +++ b/automake.in @@ -3416,7 +3416,7 @@ sub handle_dist () # If SUBDIRS is conditionally defined, then set DIST_SUBDIRS # to all possible directories, and use it. If DIST_SUBDIRS is # defined, just use it. - my $dist_subdir_name; + # Note that we check DIST_SUBDIRS first on purpose, so that # we don't call has_conditional_contents for now reason. # (In the past one project used so many conditional subdirectories @@ -3426,25 +3426,20 @@ sub handle_dist () # but it's more efficient to avoid the call anyway.) if (var ('DIST_SUBDIRS')) { - $dist_subdir_name = 'DIST_SUBDIRS'; } elsif ($subdirs->has_conditional_contents) { - $dist_subdir_name = 'DIST_SUBDIRS'; define_pretty_variable ('DIST_SUBDIRS', TRUE, INTERNAL, uniq ($subdirs->value_as_list_recursive)); } else { - $dist_subdir_name = 'SUBDIRS'; # We always define this because that is what `distclean' # wants. define_pretty_variable ('DIST_SUBDIRS', TRUE, INTERNAL, '$(SUBDIRS)'); } - - $transform{'DIST_SUBDIR_NAME'} = $dist_subdir_name; } # The remaining definitions are only required when a dist target is used. diff --git a/lib/am/distdir.am b/lib/am/distdir.am index bde95cfb6..d58a7b710 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -164,7 +164,7 @@ endif %?TOPDIR_P% ## us work correctly with an enclosing package. ## if %?SUBDIRS% - list='$(%DIST_SUBDIR_NAME%)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(mkdir_p) "$(distdir)/$$subdir" \ -- 2.47.2