[ng] texi: move some more knowledge from automake to texi-spec.am

* 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 if the '?INSRC?' transform is true.

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

diff --git a/automake.in b/automake.in
index ee713b0722aa84d588c2b92f6515b4637db8da2b..eb0e6f6815132173740d2038232d6ebfb9dc7442 100644 (file)
--- 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 7f37aef8547481b6fea53ace1d80257c9229711f..06ee2d00a3b8d02a09aaee6320905a8a8dc610bc 100644 (file)
--- 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 \