From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 16 Jun 2012 20:43:50 +0000 (+0200)
Subject: [ng] texi: "de-prettify" makeinfo command line
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a61db37a4c8f8012e9268a3780f0a97d4f145e;p=thirdparty%2Fautomake.git

[ng] texi: "de-prettify" makeinfo command line

This will make some future changes easier.  And anyway, it's usually not
worth to add code complexity to have a slightly pretty output from make;
people who want pretty output should be using "make V=0" anyway ;-)

* automake.in (handle_texinfo_helper): Make definition of $makeinfoflags
less pretty but more easy.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/automake.in b/automake.in
index cdc257986..0c4495a36 100644
--- a/automake.in
+++ b/automake.in
@@ -3007,10 +3007,7 @@ sub handle_texinfo_helper ($)
 	  push_dist_common ('$(' . $canonical . '_TEXINFOS)');
 	}
 
-      my $sdir = dirname $texi;
-      my $makeinfoflags = ($sdir eq '.' && dirname ($out_file) eq '.')
-                           ? '-I $(srcdir)'
-                           : "-I $sdir -I \$(srcdir)/$sdir";
+      my $makeinfoflags = '-I $(@D) -I $(srcdir)/$(@D)';
 
       (my $dpfx = $out_file) =~ s/\.info$//;
       $output_rules .= file_contents ('texi-spec',