* automake.in (read_am_file): Prefix included files with

$(top_srcdir) or $(srcdir) in DIST_COMMON.  Fixes
subdircond2.test, and subdircond3.test on OSF1.

diff --git a/ChangeLog b/ChangeLog
index c94b53fcd405d69bc6574227d16dd795a3eb743b..76b489d64a497fda4e0f4cff7dd36cf8310f5c53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-09-24  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * 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 73339bcb3e24ffaa4a1b1465c80ce38c903d5132..f192f0fd4c08ef989e187ecedf894e2a37c317d9 100755 (executable)
--- 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);