From dad1eb97f867e70d0c253b80132da6de24e52ba0 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 24 Sep 2002 10:51:06 +0000 Subject: [PATCH] * automake.in (read_am_file): Prefix included files with $(top_srcdir) or $(srcdir) in DIST_COMMON. Fixes subdircond2.test, and subdircond3.test on OSF1. --- ChangeLog | 4 ++++ automake.in | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c94b53fc..76b489d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-09-24 Alexandre Duret-Lutz + * automake.in (read_am_file): Prefix included files with + $(top_srcdir) or $(srcdir) in DIST_COMMON. Fixes + subdircond2.test, and subdircond3.test on OSF1. + * tests/defs.in (SHELL): Set it. * lib/am/distdir.am (distcleancheck): Mention `in build directory' diff --git a/automake.in b/automake.in index 73339bcb..f192f0fd 100755 --- a/automake.in +++ b/automake.in @@ -7842,14 +7842,24 @@ sub read_am_file ($) { push (@include_stack, "\$\(top_srcdir\)/$path"); # Distribute any included file. - my $distname = backname ($relative_dir) . '/' . $path; - push_dist_common ($distname); + + # Always use the $(top_srcdir) prefix in DIST_COMMON, + # otherwise OSF make will implicitely copy the included + # file in the build tree during `make distdir' to satisfy + # the dependency. + # (subdircond2.test and subdircond3.test will fail.) + push_dist_common ("\$\(top_srcdir\)/$path"); } else { $path =~ s/\$\(srcdir\)\///; push (@include_stack, "\$\(srcdir\)/$path"); - push_dist_common ($path); + # Always use the $(srcdir) prefix in DIST_COMMON, + # otherwise OSF make will implicitely copy the included + # file in the build tree during `make distdir' to satisfy + # the dependency. + # (subdircond2.test and subdircond3.test will fail.) + push_dist_common ("\$\(srcdir\)/$path"); $path = $relative_dir . "/" . $path; } &read_am_file ($path); -- 2.43.5