[ng] texi: less use of transforms in 'texinfos.am'

* automake.in (handle_texinfo): Drop the 'MOSTLYCLEAN', 'TEXICLEAN'
and 'MAINTCLEAN' transforms, instead adding directly to '%clean_dirs'
as appropriate.
* lib/am/texinfos.am: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 7361945400be4087683eadf5c7047650b7c35561..77d38fe39e898b8d4e0c797cc0747d8f79782efa 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -2984,12 +2984,15 @@ sub handle_texinfo ()
       chomp $clean;
       chomp $maintclean;
     }
+  # Append to dirs, not files, because the files in '$*clean' can also
+  # contain any directory created by "makeinfo --html", as well as the
+  # '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
+  $clean_dirs{$mostlyclean} = MOSTLY_CLEAN;
+  $clean_dirs{$clean} = CLEAN;
+  $clean_dirs{$maintclean} = MAINTAINER_CLEAN;
 
   $output_rules .=  file_contents ('texinfos',
                                   new Automake::Location,
-                                  MOSTLYCLEAN   => $mostlyclean,
-                                  TEXICLEAN     => $clean,
-                                  MAINTCLEAN    => $maintclean,
                                   'LOCAL-TEXIS' => !!$info_texinfos);
 }
 

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 2b47560090f50f11f35bdd1b3127499c6b7dd068..704c200d6a0f28d0cb168dc80be08e04da0ce51d 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -280,13 +280,5 @@ endif %?LOCAL-TEXIS%
 ## ---------- ##
 
 if %?LOCAL-TEXIS%
-## Append to dirs, not files, because the %*CLEAN% substitutions can
-## also contain any directory created by "makeinfo --html", as well as
-## the '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
-am.clean.mostly.d += %MOSTLYCLEAN%
-am.clean.normal.d += %TEXICLEAN%
-am.clean.maint.d += %MAINTCLEAN%
-
 am.clean.maint.f += $(foreach f,$(INFO_DEPS),$f $f-[0-9] $f-[0-9][0-9])
-
 endif %?LOCAL-TEXIS%