1 files changed, 23 insertions, 1 deletions
diff --git a/automake.in b/automake.in
index d45941855..6297318f0 100755
--- a/automake.in
+++ b/automake.in
@@ -7075,12 +7075,34 @@ sub am_install_var
 		next;
 	    }
 
+	    # Directories installed during 'install-exec' phase.
+	    my %exec_dir_p =
+	      (
+	       'bin'		=> 1,
+	       'sbin'		=> 1,
+	       'libexec'	=> 1,
+	       'data'		=> 0,
+	       'sysconf'	=> 1,
+	       'localstate'	=> 1,
+	       'lib'		=> 1,
+	       'info'		=> 0,
+	       'man'		=> 0,
+	       'include'	=> 0,
+	       'oldinclude'	=> 0,
+	       'pkgdata'	=> 0,
+	       'pkglib'		=> 1,
+	       'pkginclude'	=> 0
+	      );
+	    my $exec_p = (defined $exec_dir_p {$X}
+			  ? $exec_dir_p {$X}
+			  : ($X =~ /exec/));
+
 	    $output_rules .=
 	      &file_contents ($file,
 			      &transform ('DIR'  => $X,
 					  'NDIR' => $nodir_name,
 					  'BASE' => $strip_subdir,
-					  'EXEC' => $X =~ /exec/)
+					  'EXEC' => $exec_p)
 			      . $ltxform
 			      . $cygxform);
 	}