diff options
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); } |