[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Automake-NG] [PATCH 21/26] [ng] texi: move some more knowledge from
From: |
Dave Hart |
Subject: |
Re: [Automake-NG] [PATCH 21/26] [ng] texi: move some more knowledge from automake to texi-spec.am |
Date: |
Sun, 17 Jun 2012 03:26:25 +0000 |
On Sat, Jun 16, 2012 at 9:30 PM, Stefano Lattarini
<address@hidden> wrote:
> * automake.in (handle_texinfo_source): Do not define '$dipfx', nor
> use it for the transform '%DEST_INFO_PREFIX%'.
> * lib/am/texi-spec.am: Adjust the prefix of the output info file by
> adding '$(srcdir)' to it, unless the '?INSRC?' transform is true.
s/unless/if/ assuming I read the code below correctly.
Cheers,
Dave Hart
>
> Signed-off-by: Stefano Lattarini <address@hidden>
> ---
> automake.in | 2 --
> lib/am/texi-spec.am | 15 ++++++++++-----
> 2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/automake.in b/automake.in
> index 7db8d99..02b75b7 100644
> --- a/automake.in
> +++ b/automake.in
> @@ -2855,7 +2855,6 @@ sub handle_texinfo_source ($$$@)
> my ($dpfx, $dsfx) = ($dest =~ /^(.*?)(\.[^.]*)?$/);
>
> my $sdir = dirname $source;
> - my $dipfx = ($insrc ? '$(srcdir)/' : '') . $dpfx;
> my $makeinfoflags = ($sdir eq '.' && dirname ($dest) eq '.')
> ? '-I $(srcdir)'
> : "-I $sdir -I \$(srcdir)/$sdir";
> @@ -2864,7 +2863,6 @@ sub handle_texinfo_source ($$$@)
> new Automake::Location,
> DEPS => "@deps",
> DEST_PREFIX => $dpfx,
> - DEST_INFO_PREFIX => $dipfx,
> INSRC => $insrc,
> MAKEINFOFLAGS => $makeinfoflags,
> SOURCE_REAL => $source,
> diff --git a/lib/am/texi-spec.am b/lib/am/texi-spec.am
> index 7f37aef..06ee2d0 100644
> --- a/lib/am/texi-spec.am
> +++ b/lib/am/texi-spec.am
> @@ -14,16 +14,21 @@
> ## You should have received a copy of the GNU General Public License
> ## along with this program. If not, see <http://www.gnu.org/licenses/>.
>
> -INFO_DEPS += %DEST_INFO_PREFIX%.info
> -
> -%DEST_INFO_PREFIX%.info: %SOURCE_REAL% %DEPS%
> -?INSRC?%DEST_INFO_PREFIX%.info: am__info_insrc=yes
> +if %?INSRC%
> +INFO_DEPS += $(srcdir)/%DEST_PREFIX%.info
> +$(srcdir)/%DEST_PREFIX%.info: %SOURCE_REAL% %DEPS%
> +$(srcdir)/%DEST_PREFIX%.info: am__info_insrc=yes
> +else !%?INSRC%
> +INFO_DEPS += %DEST_PREFIX%.info
> +%DEST_PREFIX%.info: %SOURCE_REAL% %DEPS%
> +endif !%?INSRC%
>
> %DEST_PREFIX%.dvi: %SOURCE_REAL% %DEPS%
> %DEST_PREFIX%.pdf: %SOURCE_REAL% %DEPS%
> %DEST_PREFIX%.html: %SOURCE_REAL% %DEPS%
>
> -%DEST_INFO_PREFIX%.info \
> +?INSRC?$(srcdir)/%DEST_PREFIX%.info \
> +?!INSRC?%DEST_PREFIX%.info \
> %DEST_PREFIX%.dvi \
> %DEST_PREFIX%.pdf \
> %DEST_PREFIX%.html \
> --
> 1.7.9.5
>
>
- [Automake-NG] [PATCH 16/26] [ng] refactor: more proper name for a subroutine in automake, (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
- Re: [Automake-NG] [PATCH 21/26] [ng] texi: move some more knowledge from automake to texi-spec.am,
Dave Hart <=
- [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, 2012/06/16
- [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