diff -p -u -r automake_patch2/ChangeLog automake_patch3/ChangeLog
--- automake_patch2/ChangeLog	Thu Aug 16 20:56:13 2001
+++ automake_patch3/ChangeLog	Thu Aug 16 23:02:28 2001
@@ -1,5 +1,10 @@
 2001-08-16  Richard Boulton <address@hidden>
 
+	* automake.in (handle_dist): Tidy up some very contorted logic and
+	remove some perl4-isms.
+
+2001-08-16  Richard Boulton <address@hidden>
+
 	* automake.in (handle_dist): Out of date comment removed.
 	(variable_conditionally_defined): Updated to recurse itself,
 	rather than calling variable_conditions_recursive(): removes an
diff -p -u -r automake_patch2/automake.in automake_patch3/automake.in
--- automake_patch2/automake.in	Thu Aug 16 20:41:45 2001
+++ automake_patch3/automake.in	Thu Aug 16 22:10:19 2001
@@ -3548,27 +3548,27 @@ sub handle_dist
     # recursive build.
     if (&variable_defined ('SUBDIRS'))
     {
+	# If DIST_SUBDIRS is defined, use it.
 	# If SUBDIRS is conditionally defined, then set DIST_SUBDIRS
-	# to all possible directories, and use it.  If DIST_SUBDIRS is
-	# defined, just use it.
+	# to all possible directories, and use it.
+	# Otherwise, just use SUBDIRS.
 	my $dist_subdir_name;
-	if (&variable_defined ('DIST_SUBDIRS')
-	    || variable_conditionally_defined ('SUBDIRS'))
+	if (variable_defined ('DIST_SUBDIRS')
 	{
 	    $dist_subdir_name = 'DIST_SUBDIRS';
-	    if (! &variable_defined ('DIST_SUBDIRS'))
-	    {
-		&define_pretty_variable
-		  ('DIST_SUBDIRS', '',
-		   uniq (&variable_value_as_list_recursive ('SUBDIRS', 'all')));
-	    }
+	}
+	elsif (variable_conditionally_defined ('SUBDIRS'))
+	{
+	    $dist_subdir_name = 'DIST_SUBDIRS';
+	    define_pretty_variable ('DIST_SUBDIRS', '',
+		   uniq (variable_value_as_list_recursive ('SUBDIRS', 'all')));
 	}
 	else
 	{
 	    $dist_subdir_name = 'SUBDIRS';
 	    # We always define this because that is what `distclean'
 	    # wants.
-	    &define_pretty_variable ('DIST_SUBDIRS', '', '$(SUBDIRS)');
+	    define_pretty_variable ('DIST_SUBDIRS', '', '$(SUBDIRS)');
 	}
 
 	$transform{'DIST_SUBDIR_NAME'} = $dist_subdir_name;