[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
exec-dir-simplify.patch
From: |
Alexandre Duret-Lutz |
Subject: |
exec-dir-simplify.patch |
Date: |
09 Nov 2001 16:10:16 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
Index: ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,1 +1,7 @@
+2001-11-09 Alexandre Duret-Lutz <address@hidden>
+
+ * automake.in (exec_dir_p): Remove. Replace by...
+ (EXEC_DIR_PATTERN):... this.
+ (am_install_var): Adjust to use EXEC_DIR_PATTERN.
+
Index: automake.in
===================================================================
RCS file: /home/adl/CVSROOT/automake-20011109-1421/automake.in,v
retrieving revision 1.1
diff -u -r1.1 automake.in
--- automake.in 9 Nov 2001 13:21:34 -0000 1.1
+++ automake.in 9 Nov 2001 14:34:40 -0000
@@ -175,6 +175,9 @@
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_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 @@
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$//;
--
Alexandre Duret-Lutz
- exec-dir-simplify.patch,
Alexandre Duret-Lutz <=