Re: Installing header files

[Alexandre Duret-Lutz]

 adl> 2001-10-16  Alexandre Duret-Lutz  <address@hidden>

 adl> * automake.in (am_install_var): Don't strip nobase_ from $X, do
 adl> this with $nodir_name only.

Here is an update of this patch, which, I beleive, should fix
the bug reported by Braden McDaniel about nodist_noinst.

2001-10-17  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (am_install_var): Don't strip nobase_ from $X, do
        this with $nodir_name only.  Use $nodir_name where appropriate.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1181
diff -u -r1.1181 automake.in
--- automake.in 2001/10/15 09:38:29     1.1181
+++ automake.in 2001/10/17 07:20:03
@@ -7401,25 +7401,25 @@
     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 @@
            # Skip configure substitutions.  Possibly bogus.
            if ($rcurs =~ /address@hidden@$/)
              {
-               if ($X eq 'EXTRA')
+               if ($nodir_name eq 'EXTRA')
                  {
                    if (! $warned_about_extra)
                      {
@@ -7495,14 +7495,14 @@
 
        # "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 @@
          }
 
        # 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$//;

-- 
Alexandre Duret-Lutz