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 <[email protected]> --- automake.in | 3 --- lib/am/texi-spec.am | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/automake.in b/automake.in index dca4275..7db8d99 100644 --- 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 de7a1ec..7f37aef 100644 --- 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 \ -- 1.7.9.5
