2006-01-04  Stepan Kasal  <address@hidden>

	* automake.in (handle_dist) <DISTDIRS>: Replace $(top_srcdir) and
	  $(srcdir) by $(top_builddir) or $(builddir), respectively.
	* tests/distdir.test: Test for it.

diff -urpN automake.orig/automake.in automake/automake.in
--- automake.orig/automake.in	2006-01-04 20:25:49.000000000 +0100
+++ automake/automake.in	2006-01-04 20:56:44.000000000 +0100
@@ -3635,7 +3635,7 @@ sub handle_dist ()
   $transform{'GETTEXT'} = $seen_gettext && !$seen_gettext_external;
 
   # Prepend $(distdir) to each directory given.
-  my %rewritten = map { s|^\$[({](top_)?srcdir[)}]|\$($1builddir)|;
+  my %rewritten = map { s|^\$[({]((top_)?)srcdir[)}]|\$($1builddir)|;
 			'$(distdir)/' . "$_" => 1 } keys %dist_dirs;
   $transform{'DISTDIRS'} = join (' ', sort keys %rewritten);
 
diff -urpN automake.orig/tests/distdir.test automake/tests/distdir.test
--- automake.orig/tests/distdir.test	2005-05-14 22:28:54.000000000 +0200
+++ automake/tests/distdir.test	2006-01-04 20:57:03.000000000 +0100
@@ -19,20 +19,21 @@
 # Boston, MA 02110-1301, USA.
 
 # Test to make sure subdirs in EXTRA_DIST work.  Also tests to make
-# sure "./" is ignored.
+# sure "./" is ignored and *srcdir is replaced by *builddir.
 
 . ./defs || exit 1
 
 set -e
 
 cat > Makefile.am << 'END'
-EXTRA_DIST = foo/bar ./joe
+EXTRA_DIST = foo/bar ./joe $(top_srcdir)/woo/doo $(srcdir)/dada
 END
 
 $ACLOCAL
 $AUTOMAKE
 
 grep '\$(mkdir_p).*\.' Makefile.in && exit 1
+grep '\$(mkdir_p).*srcdir' Makefile.in && exit 1
 grep '\$(mkdir_p).*foo' Makefile.in
 
 # Check to make sure `foo' isn't made in build directory.