From d27dff5dcb1b706970ec3b6fcc84e310b8cb74cb Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Tue, 27 Feb 2001 09:26:37 +0000
Subject: [PATCH] * automake.in (%exec_dir_p): Pulled out from...
 (&am_primary_prefixes): here.

---
 ChangeLog   |  5 +++++
 automake.in | 37 +++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 11e41a35..cb51d1a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-27  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (%exec_dir_p): Pulled out from...
+	(&am_primary_prefixes): here.
+
 2001-02-27  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&usage): Display $0, not $me.
diff --git a/automake.in b/automake.in
index a1bd22fc..1293bc6c 100755
--- a/automake.in
+++ b/automake.in
@@ -6814,6 +6814,25 @@ sub am_primary_prefixes
     return %valid;
 }
 
+# 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
+  );
+
 # Handle `where_HOW' variable magic.  Does all lookups, generates
 # install code, and possibly generates code to define the primary
 # variable.  The first argument is the name of the .am file to munge,
@@ -7067,24 +7086,6 @@ 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/));
-- 
2.43.5