From de27dcb6915b1193f62ea5dec206155d4a2075f3 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 14 Mar 2003 21:46:57 +0000 Subject: [PATCH] * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in subdirectories. Makefile.in depends on that variable. --- ChangeLog | 5 +++++ automake.in | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8927080..8a35c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-14 Jim Meyering + + * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in + subdirectories. Makefile.in depends on that variable. + 2003-03-13 Alexandre Duret-Lutz * m4/init.m4: Remove a leftover comment from the pre-1.7 era. diff --git a/automake.in b/automake.in index 20c4c15..4f9df1e 100755 --- a/automake.in +++ b/automake.in @@ -4356,6 +4356,13 @@ sub scan_aclocal_m4 { my $regen_aclocal = 0; + if (-f 'aclocal.m4') + { + # When using aclocal.m4, define this variable even in subdirectories, + # because every Makefile.in depends on $(ACLOCAL_M4). + &define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL); + } + return (0, ()) unless $relative_dir eq '.'; @@ -4364,7 +4371,6 @@ sub scan_aclocal_m4 if (-f 'aclocal.m4') { - &define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL); &push_dist_common ('aclocal.m4'); my $aclocal = new Automake::XFile "< aclocal.m4"; -- 2.7.4