FYI: fix subdircond2 and subdircond3.test on OSF1

[Alexandre Duret-Lutz]

I'm checking this in.

2002-09-24  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (read_am_file): Prefix included files with
        $(top_srcdir) or $(srcdir) in DIST_COMMON.  Fixes
        subdircond2.test, and subdircond3.test on OSF1.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1362
diff -u -r1.1362 automake.in
--- automake.in 23 Sep 2002 22:08:30 -0000      1.1362
+++ automake.in 24 Sep 2002 10:48:24 -0000
@@ -7842,14 +7842,24 @@
              {
                 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);

-- 
Alexandre Duret-Lutz