From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 16 Jun 2012 18:56:37 +0000 (+0200)
Subject: [ng] texi: in texi-spec.am, assume suffix for info files is always '.info'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3f23065c783eb8221957b2d621b8d2f799ea4e;p=thirdparty%2Fautomake.git

[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 d65cad0f0..ee713b072 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 de7a1ecfe..7f37aef85 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 \