From 673afd53c32fe365d2d3d9f33d12e1c1f824503a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 12 Aug 2012 12:14:07 +0200 Subject: [PATCH] [ng] rename: am__info_insrc -> am.texi.info-in-srcdir Signed-off-by: Stefano Lattarini --- lib/am/texi-spec.am | 2 +- lib/am/texibuild.mk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/am/texi-spec.am b/lib/am/texi-spec.am index 0587a6dc6..61c11c589 100644 --- 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 5d515069e..86ae249fc 100644 --- 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 -- 2.47.2