60-dist-common.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (&am_install_var): Transform DIST, and let the *.am
        files handle DIST_COMMON.
        * data.am, header.am, java.am, list.am, python.am, script.am: Set
        DIST_COMMON.

Index: automake.in
--- automake.in Sun, 11 Mar 2001 22:42:47 +0100 akim (am/f/39_automake.i 1.178 
755)
+++ automake.in Mon, 12 Mar 2001 21:25:33 +0100 akim (am/f/39_automake.i 1.178 
755)
@@ -7069,20 +7069,14 @@ sub am_install_var
                $X =~ s/^nobase_//;
            }

-           my $nodir_name;
+           my $nodir_name = $X;
            # If files should be distributed, do so.
+           my $dist_p = 0;
            if ($can_dist)
            {
-               if (($default_dist && $one_name !~ /^nodist_/)
-                   || (! $default_dist && $one_name =~ /^dist_/))
-               {
-                   &push_dist_common ('$(' . $one_name . ')');
-               }
-               ($nodir_name = $X) =~ s/^(dist|nodist)_//;
-           }
-           else
-           {
-               $nodir_name = $X;
+               $dist_p = (($default_dist && $one_name !~ /^nodist_/)
+                          || (! $default_dist && $one_name =~ /^dist_/));
+               $nodir_name =~ s/^(dist|nodist)_//;
            }

            # Append actual contents of where_PRIMARY variable to
@@ -7178,14 +7172,14 @@ sub am_install_var
            my $exec_p = (defined $exec_dir_p {$X}
                          ? $exec_dir_p {$X}
                          : ($X =~ /exec/));
-
            $output_rules .= &file_contents ($file,
                                             ('DIR'  => $X,
                                              'NDIR' => $nodir_name,
                                              'BASE' => $strip_subdir,

                                              'EXEC'    => $exec_p,
-                                             'INSTALL' => $install_p));
+                                             'INSTALL' => $install_p,
+                                             'DIST'    => $dist_p));
        }
     }

Index: data.am
--- data.am Sun, 11 Mar 2001 18:49:28 +0100 akim (am/g/46_data.am 1.11 644)
+++ data.am Mon, 12 Mar 2001 21:20:06 +0100 akim (am/g/46_data.am 1.11 644)
@@ -64,3 +64,12 @@
 ## ---------- ##

 ## Nothing.
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_DATA)
+endif %?DIST%
Index: header.am
--- header.am Sun, 11 Mar 2001 18:49:28 +0100 akim (am/g/38_header.am 1.10 644)
+++ header.am Mon, 12 Mar 2001 21:20:22 +0100 akim (am/g/38_header.am 1.10 644)
@@ -56,3 +56,12 @@
          rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_HEADERS)
+endif %?DIST%
Index: java.am
--- java.am Sun, 11 Mar 2001 18:49:28 +0100 akim (am/g/36_java.am 1.9 644)
+++ java.am Mon, 12 Mar 2001 21:20:36 +0100 akim (am/g/36_java.am 1.9 644)
@@ -59,3 +59,12 @@
 .PHONY clean-am: clean-%DIR%JAVA:
 clean-%DIR%JAVA:
        -rm -f *.class class%DIR%.stamp
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_JAVA)
+endif %?DIST%
Index: lisp.am
--- lisp.am Sun, 11 Mar 2001 18:49:28 +0100 akim (am/g/29_lisp.am 1.12 644)
+++ lisp.am Mon, 12 Mar 2001 21:21:12 +0100 akim (am/g/29_lisp.am 1.12 644)
@@ -69,3 +69,12 @@
 .PHONY clean-am: clean-lisp
 clean-lisp:
        -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_LISP)
+endif %?DIST%
Index: python.am
--- python.am Sun, 11 Mar 2001 18:49:28 +0100 akim (am/g/19_python.am 1.8 644)
+++ python.am Mon, 12 Mar 2001 21:21:45 +0100 akim (am/g/19_python.am 1.8 644)
@@ -66,3 +66,12 @@
 .PHONY clean-am: clean-python
 clean-python:
        -test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_PYTHON)
+endif %?DIST%
Index: scripts.am
--- scripts.am Sun, 11 Mar 2001 18:31:44 +0100 akim (am/g/15_scripts.am 1.10 
644)
+++ scripts.am Mon, 12 Mar 2001 21:19:53 +0100 akim (am/g/15_scripts.am 1.10 
644)
@@ -43,6 +43,7 @@
        done
 endif %?INSTALL%

+
 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##
@@ -57,6 +58,15 @@
          rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_SCRIPTS)
+endif %?DIST%


 ## ---------- ##