[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 20/26] [ng] texi: in texi-spec.am, assume suffix fo
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 20/26] [ng] texi: in texi-spec.am, assume suffix for info files is always '.info' |
Date: |
Sat, 16 Jun 2012 23:30:07 +0200 |
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 <address@hidden>
---
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
- Re: [Automake-NG] [PATCH 18/26] [ng] coverage: texinfo input files using @include directives, (continued)
[Automake-NG] [PATCH 19/26] [ng] automake: remove two unused variables from '&handle_texinfo_source', Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 21/26] [ng] texi: move some more knowledge from automake to texi-spec.am, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 22/26] [ng] texi: simplify handle_texinfo_source by assuming '.info' suffix ..., Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 23/26] [ng] automake: merge handle_texinfo_source() -> handle_texinfo_helper(), Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 20/26] [ng] texi: in texi-spec.am, assume suffix for info files is always '.info',
Stefano Lattarini <=
[Automake-NG] [PATCH 24/26] [ng] texi: "de-prettify" makeinfo command line, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 25/26] [ng] texi: move more code from automake to Makefile, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 26/26] [ng] texi: remove some crufty code to support obsolete environment, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 27/26] [ng] tests: rename silent8.sh -> silent-info.sh, Stefano Lattarini, 2012/06/17
[Automake-NG] [PATCH 28/26] [ng] coverage: texinfo silent rules with a subdir texinfo file, Stefano Lattarini, 2012/06/17