diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-19 16:48:19 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-19 22:13:13 +0200 |
commit | 8f252e4ce02f36ccb06d26fd401a6285b491ae8b (patch) | |
tree | 5dc2cbcdcadfc324e3f99457f1e2dc2fff13117d /bin | |
parent | 533186d2edfbcfeac9944ff06e7770fae68be6d9 (diff) | |
download | automake-8f252e4ce02f36ccb06d26fd401a6285b491ae8b.tar.gz |
texi: build version.texi and stamp-vti in srcdir
Do so even when the 'info-in-builddir' option is present, or when
the corresponding '*.info' files are listed in $(CLEANFILES) or in
$(DISTCLEANFILES).
This fixes failures in the following tests, when they are run with
$MAKE pointing to FreeBSD make:
- txinfo-nodist-info.sh
- txinfo23.sh
- txinfo24.sh
- txinfo28.sh
- txinfo25.sh
BTW, notice that the test 'txinfo-builddir.sh' fails with FreeBSD make
as well, but that is due to a known FreeBSD make VPATH issue (the same
described in automake bug#7884). But that is not a regression, since
the 'info-in-builddir' option will be new in Automake 1.14. Moreover,
we already warn in the manual that the use of that option can indeed
cause problems with VPATH builds done by non-GNU make.
* bin/automake.in (handle_texinfo_helper): New local variable
'$soutdir'. Use it instead of '$outdir' where appropriate (in
particular, in the transform used on file 'texi-vers.am'.
* t/txinfo-builddir.sh: Adjust to avoid spurious failures.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bin')
-rw-r--r-- | bin/automake.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/automake.in b/bin/automake.in index c95289f8c..8f3fb4878 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -3217,6 +3217,7 @@ sub handle_texinfo_helper # was once done when the (now removed) 'cygnus' option was # given. See automake bug#11034 for more discussion. my $insrc = 1; + my $soutdir = '$(srcdir)/' . $outdir; if (option 'info-in-builddir') { @@ -3239,12 +3240,12 @@ Oops! EOF } - $outdir = '$(srcdir)/' . $outdir if $insrc; + $outdir = $soutdir if $insrc; # If user specified file_TEXINFOS, then use that as explicit # dependency list. @texi_deps = (); - push (@texi_deps, "$outdir$vtexi") if $vtexi; + push (@texi_deps, "${soutdir}${vtexi}") if $vtexi; my $canonical = canonicalize ($infobase); if (var ($canonical . "_TEXINFOS")) @@ -3298,8 +3299,8 @@ EOF new Automake::Location, TEXI => $texi, VTI => $vti, - STAMPVTI => "${outdir}stamp-$vti", - VTEXI => "$outdir$vtexi", + STAMPVTI => "${soutdir}stamp-$vti", + VTEXI => "$soutdir$vtexi", MDDIR => $conf_dir, DIRSTAMP => $dirstamp); } |