[Automake-NG] [PATCH 2/4] [ng] rename: am__aclocal_m4_deps -> am.remake.aclocal-m4-deps

[Stefano Lattarini]

Signed-off-by: Stefano Lattarini <address@hidden>
---
 automake.in         |    5 +++--
 lib/am/configure.am |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/automake.in b/automake.in
index e238106..1a45aa0 100644
--- a/automake.in
+++ b/automake.in
@@ -3616,9 +3616,10 @@ sub handle_configure ($$$@)
   $colon_infile = '' if $colon_infile eq ":$makefile.in";
   my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
   my $regen_aclocal_m4 = scan_aclocal_m4;
-  define_variable ('am__aclocal_m4_deps', INTERNAL,
+  define_variable ('am.remake.aclocal-m4-deps', INTERNAL,
                    @configure_deps, '$(top_srcdir)/' . $configure_ac);
-  my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
+  my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
+                       '$(CONFIGURE_DEPENDENCIES)');
   push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
   define_variable ('am__configure_deps', INTERNAL, @configuredeps);
 
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 34b2d32..cab6595 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -107,12 +107,12 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% 
$(am__configure_deps)
 ## we should hopefully be able to get rid of it in a not-so-distant
 ## future.
 if %?REGEN-ACLOCAL-M4%
-$(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): %MAINTAINER-MODE% $(am.remake.aclocal-m4-deps)
 ?TOPDIR_P?     cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 ?!TOPDIR_P?    cd $(top_builddir) && $(MAKE) .am/nil
 
 ## Avoid the "deleted header file" problem for the dependencies.
-$(am__aclocal_m4_deps):
+$(am.remake.aclocal-m4-deps):
 endif %?REGEN-ACLOCAL-M4%
 
 
-- 
1.7.10.4