* automake.in (exec_dir_p): Remove. Replace by...

(EXEC_DIR_PATTERN):... this.
(am_install_var): Adjust to use EXEC_DIR_PATTERN.

diff --git a/ChangeLog b/ChangeLog
index 08a7142a8eab38b4c68da5f7ea81e93e573f375f..3bb5964cf0f4531cb04fd07283daaf0902fdbccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2001-10-31  Alexandre Duret-Lutz  <duret_g@epita.fr>
+2001-11-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (exec_dir_p): Remove.  Replace by...
+       (EXEC_DIR_PATTERN):... this.
+       (am_install_var): Adjust to use EXEC_DIR_PATTERN.
+
+2001-11-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        Fix for nobase.test:
        * lib/am/header-vars.am (install_sh_DATA): New.

diff --git a/automake.in b/automake.in
index 94fd5862936646eb7f0c13b08fee140ab31e555a..0bf5349f4301676441961e162f76a69cb1d8a8e0 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -175,6 +175,9 @@ my $AC_SUBST_PATTERN = 'AC_SUBST\(\[?(\w+)';
 my $AM_CONDITIONAL_PATTERN = 'AM_CONDITIONAL\(\[?(\w+)';
 # Match `-d' as a command-line argument in a string.
 my $DASH_D_PATTERN = "(^|\\s)-d(\\s|\$)";
+# Directories installed during 'install-exec' phase.
+my $EXEC_DIR_PATTERN =
+    '^(?:bin|sbin|libexec|sysconf|localstate|lib|pkglib|.*exec.*)$'; #'
 
 # Constants to define the "strictness" level.
 use constant FOREIGN => 0;
@@ -233,25 +236,6 @@ my $LANG_IGNORE = 0;
 my $LANG_PROCESS = 1;
 my $LANG_SUBDIR = 2;
 
-# 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
-  );
-
 # Map from obsolete macros to hints for new macros.
 # If you change this, change the corresponding list in aclocal.in.
 # FIXME: should just put this into a single file.
@@ -7493,9 +7477,7 @@ sub am_install_var
        my $install_p = $nodir_name ne 'noinst' && $nodir_name ne 'check';
 
        # If so, with install-exec? (or install-data?).
-       my $exec_p = (defined $exec_dir_p {$nodir_name}
-                     ? $exec_dir_p {$nodir_name}
-                     : ($nodir_name =~ /exec/));
+       my $exec_p = ($nodir_name =~ /$EXEC_DIR_PATTERN/o);
 
        # Singular form of $PRIMARY.
        (my $one_primary = $primary) =~ s/S$//;