[ng] texi: in texi-spec.am, assume suffix for info files is always '.info'

This has been the case since an earlier patch.

* lib/am/texi-spec.am: Simply use '.info' instead of '%DEST_SUFFIX%'.
* automake.in (handle_texinfo_source): Drop the now-useless transform
'%DEST_SUFFIX%' for texi-spec.am

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

diff --git a/automake.in b/automake.in
index d65cad0f00b55701577ada3b69e0b158a2f19150..ee713b0722aa84d588c2b92f6515b4637db8da2b 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -2854,8 +2854,6 @@ sub handle_texinfo_source ($$$@)
 
   my ($dpfx, $dsfx) = ($dest =~ /^(.*?)(\.[^.]*)?$/);
 
-  $dsfx ||= "";
-
   my $sdir = dirname $source;
   my $dipfx = ($insrc ? '$(srcdir)/' : '') . $dpfx;
   my $makeinfoflags = ($sdir eq '.' && dirname ($dest) eq '.')
@@ -2867,7 +2865,6 @@ sub handle_texinfo_source ($$$@)
                                  DEPS             => "@deps",
                                  DEST_PREFIX      => $dpfx,
                                  DEST_INFO_PREFIX => $dipfx,
-                                 DEST_SUFFIX      => $dsfx,
                                  INSRC            => $insrc,
                                  MAKEINFOFLAGS    => $makeinfoflags,
                                  SOURCE_REAL      => $source,

diff --git a/lib/am/texi-spec.am b/lib/am/texi-spec.am
index de7a1ecfedb75cb58bca66861b1765ccaa9468ea..7f37aef8547481b6fea53ace1d80257c9229711f 100644 (file)
--- a/lib/am/texi-spec.am
+++ b/lib/am/texi-spec.am
@@ -16,14 +16,14 @@
 
 INFO_DEPS += %DEST_INFO_PREFIX%.info
 
-%DEST_INFO_PREFIX%%DEST_SUFFIX%: %SOURCE_REAL% %DEPS%
-?INSRC?%DEST_INFO_PREFIX%%DEST_SUFFIX%: am__info_insrc=yes
+%DEST_INFO_PREFIX%.info: %SOURCE_REAL% %DEPS%
+?INSRC?%DEST_INFO_PREFIX%.info: am__info_insrc=yes
 
 %DEST_PREFIX%.dvi: %SOURCE_REAL% %DEPS%
 %DEST_PREFIX%.pdf: %SOURCE_REAL% %DEPS%
 %DEST_PREFIX%.html: %SOURCE_REAL% %DEPS%
 
-%DEST_INFO_PREFIX%%DEST_SUFFIX% \
+%DEST_INFO_PREFIX%.info \
 %DEST_PREFIX%.dvi \
 %DEST_PREFIX%.pdf \
 %DEST_PREFIX%.html \