[ng] rename: am__info_insrc -> am.texi.info-in-srcdir

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

diff --git a/lib/am/texi-spec.am b/lib/am/texi-spec.am
index 0587a6dc6c4839ca973f0b21894861c2a600d56f..61c11c5893b949b6d31fd59f8ae96661fac07aa0 100644 (file)
--- a/lib/am/texi-spec.am
+++ b/lib/am/texi-spec.am
@@ -17,7 +17,7 @@
 if %?INSRC%
 INFO_DEPS += $(srcdir)/%DEST_PREFIX%.info
 $(srcdir)/%DEST_PREFIX%.info: %SOURCE_REAL% %DEPS%
-$(srcdir)/%DEST_PREFIX%.info: am__info_insrc=yes
+$(srcdir)/%DEST_PREFIX%.info: am.texi.info-in-srcdir=yes
 else !%?INSRC%
 INFO_DEPS += %DEST_PREFIX%.info
 %DEST_PREFIX%.info: %SOURCE_REAL% %DEPS%

diff --git a/lib/am/texibuild.mk b/lib/am/texibuild.mk
index 5d515069eec6a6474ee58c5864a0bed181d59fce..86ae249fce9025270ec471f91c9d1e335322a435 100644 (file)
--- a/lib/am/texibuild.mk
+++ b/lib/am/texibuild.mk
@@ -61,16 +61,16 @@ define am.texi.build.info
            if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
          done; \
        else :; fi && \
-       $(if $(am__info_insrc),cd '$(CURDIR)' &&) \
+       $(if $(am.texi.info-in-srcdir),cd '$(CURDIR)' &&) \
        if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
                       -I $(@D) -I $(srcdir)/$(@D) -o $@ $<; \
        then \
          rc=0; \
-         $(if $(am__info_insrc),cd $(srcdir) || exit 1;) \
+         $(if $(am.texi.info-in-srcdir),cd $(srcdir) || exit 1;) \
        else \
          rc=$$?; \
 ## Beware that backup info files might come from a subdirectory.
-         $(if $(am__info_insrc),cd $(srcdir) &&) \
+         $(if $(am.texi.info-in-srcdir),cd $(srcdir) &&) \
          $$restore $$backupdir/* $(@D) || exit 1; \
        fi; \
        rm -rf $$backupdir; exit $$rc
@@ -98,7 +98,7 @@ define am.texi.build.html
 endef
 
 %.info: %.texi
-       $(call am.texi.build.info,$(am__info_insrc))
+       $(call am.texi.build.info,$(am.texi.info-in-srcdir))
 %.dvi: %.texi
        $(call am.texi.build.dvi-or-pdf,$(AM_V_TEXI2DVI),$(TEXI2DVI),$(@:.dvi=.t2d))
 %.pdf: %.texi