* automake.in (am_install_var): Don't strip nobase_ from $X, do

this with $nodir_name only.  Use $nodir_name where appropriate.

diff --git a/ChangeLog b/ChangeLog
index 6b94a71a7394d8405c5ed6cebddf5d15a646197e..ac5023ccd5a833406a2e04b32cdb952137b948c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (am_install_var): Don't strip nobase_ from $X, do
+       this with $nodir_name only.  Use $nodir_name where appropriate.
+
 2001-10-15  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (handle_languages, handle_single_transform_list,
@@ -23,7 +28,7 @@
        Use AC_CONFIG_COMMANDS.
        (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use AS_DIRNAME and AS_MKDIR_P.
 
-       
+
 2001-10-15  Akim Demaille  <akim@epita.fr>
 
        * m4/header.m4 (AM_CONFIG_HEADER): Don't use m4_patsubst.

diff --git a/automake.in b/automake.in
index bde6112009b30af280ba37407b3ba0beca93ebf3..e9170def65a79b8a7098886aecac6f0c16e8b6bb 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7401,25 +7401,25 @@ sub am_install_var
     my $first = 1;
     foreach my $X (sort keys %valid)
     {
+       my $nodir_name = $X;
        my $one_name = $X . '_' . $primary;
        next
          unless (&variable_defined ($one_name));
 
        my $strip_subdir = 1;
        # If subdir prefix should be preserved, do so.
-       if ($X =~ /^nobase_/)
+       if ($nodir_name =~ /^nobase_/)
          {
            $strip_subdir = 0;
-           $X =~ s/^nobase_//;
+           $nodir_name =~ s/^nobase_//;
          }
 
-       my $nodir_name = $X;
        # If files should be distributed, do so.
        my $dist_p = 0;
        if ($can_dist)
          {
-           $dist_p = (($default_dist && $one_name !~ /^nodist_/)
-                      || (! $default_dist && $one_name =~ /^dist_/));
+           $dist_p = (($default_dist && $nodir_name !~ /^nodist_/)
+                      || (! $default_dist && $nodir_name =~ /^dist_/));
            $nodir_name =~ s/^(dist|nodist)_//;
          }
 
@@ -7430,7 +7430,7 @@ sub am_install_var
            # Skip configure substitutions.  Possibly bogus.
            if ($rcurs =~ /^\@.*\@$/)
              {
-               if ($X eq 'EXTRA')
+               if ($nodir_name eq 'EXTRA')
                  {
                    if (! $warned_about_extra)
                      {
@@ -7495,14 +7495,14 @@ sub am_install_var
 
        # "EXTRA" shouldn't be used when generating clean targets,
        # all, or install targets.
-       if ($X eq 'EXTRA')
+       if ($nodir_name eq 'EXTRA')
          {
            # We used to warn if EXTRA_FOO was defined uselessly,
            # but this was annoying.
            next;
          }
 
-       if ($X eq 'check')
+       if ($nodir_name eq 'check')
          {
            push (@check, '$(' . $one_name . ')');
          }
@@ -7512,12 +7512,12 @@ sub am_install_var
          }
 
        # Is this to be installed?
-       my $install_p = $X ne 'noinst' && $X ne 'check';
+       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 {$X}
-                     ? $exec_dir_p {$X}
-                     : ($X =~ /exec/));
+       my $exec_p = (defined $exec_dir_p {$nodir_name}
+                     ? $exec_dir_p {$nodir_name}
+                     : ($nodir_name =~ /exec/));
 
        # Singular form of $PRIMARY.
        (my $one_primary = $primary) =~ s/S$//;