* automake.in: Formatting and mying changes.

diff --git a/ChangeLog b/ChangeLog
index 6a1eb2515f68aff871090d442835e23d9f0d090a..6be4aa005a6b270bfa6059eb2721be484a0d02f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-23  Akim Demaille  <akim@epita.fr>
+
+       * automake.in: Formatting and mying changes.
+
+       
 2001-02-23  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&handle_man_pages): Let install-man and

diff --git a/automake.in b/automake.in
index 2a880277f06ad500be032b638273619fa613c7f5..3d6a83374a8bba3e723f042ca0222072e7b24ea1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6119,6 +6119,7 @@ sub read_am_file
            }
            # Value here doesn't matter; for targets we only note
            # existence.
+# FIXME: I don't understand the next line at all, it seems dead wrong --akim
            $contents{$1} = 1;
            $targets{$1} = 1;
            my $cond_string = join ('', @conditional_stack);
@@ -6390,15 +6391,14 @@ sub read_main_am_file
     }
 
     # Generate copyright header for generated Makefile.in.
-    local ($ov) = $output_vars;
+    my $ov = $output_vars;
     $output_vars = ("# $in_file_name generated automatically by automake "
                   . $VERSION . " from $am_file_name\n");
     $output_vars .= $gen_copyright;
 
     # Now go through and delete all the variables that the user did
     # not change.
-    local ($var);
-    foreach $var (keys %saved_contents)
+    foreach my $var (keys %saved_contents)
     {
        if ($contents{$var} eq $saved_contents{$var})
        {
@@ -6411,7 +6411,6 @@ sub read_main_am_file
     # end.
     &define_standard_variables;
     $output_vars .= $ov;
-
 }
 
 ################################################################
@@ -7126,8 +7125,9 @@ sub am_install_var
            # include EXEEXT when in Cygwin32 mode.
            if ($seen_exeext && $primary eq 'PROGRAMS')
            {
-               local (@conds) = &variable_conditions ($one_name);
-               local (@one_binlist);
+               my @conds = &variable_conditions ($one_name);
+
+               # FIXME: This code is mad, rewrite!
 
                # FIXME: this definitely loses aesthetically; it
                # redefines $ONE_NAME.  Instead we should arrange for
@@ -7136,7 +7136,7 @@ sub am_install_var
 
                if (! @conds)
                {
-                   @one_binlist = ();
+                   my @one_binlist = ();
                    foreach $rcurs (&variable_value_as_list ($one_name, ''))
                    {
                        if ($rcurs =~ /\./ || $rcurs =~ /^\@.*\@$/)
@@ -7154,14 +7154,13 @@ sub am_install_var
                }
                else
                {
-                   local ($cond);
                    local ($condvals) = '';
-                   foreach $cond (@conds)
+                   foreach my $cond (@conds)
                    {
-                       @one_binlist = ();
-                       local (@condval) = &variable_value_as_list ($one_name,
-                                                                   $cond);
-                       foreach $rcurs (@condval)
+                       my @one_binlist = ();
+                       my @condval = &variable_value_as_list ($one_name,
+                                                              $cond);
+                       foreach my $rcurs (@condval)
                        {
                            if ($rcurs =~ /\./ || $rcurs =~ /^\@.*\@$/)
                            {

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index c80abc0acd09dc89a261f60f3dc4a51c021aa550..50528784e30c8fe8c2cb04d526736c526ca7ae3f 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -15,6 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)

diff --git a/lib/am/python.am b/lib/am/python.am
index 8d4bb261f173a88d8160051b5e620503e06dd28a..5f1694c79d5d8cbe40a78c238b659ae944170a36 100644 (file)
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -15,6 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 install-@DIR@PYTHON: $(@DIR@_PYTHON)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 0c0b0affc38b77f77ac812317478b8ff6b65b585..d96609ce414084c6b050505f96ba478fb6af14cc 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -16,6 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,

diff --git a/lisp.am b/lisp.am
index c80abc0acd09dc89a261f60f3dc4a51c021aa550..50528784e30c8fe8c2cb04d526736c526ca7ae3f 100644 (file)
--- a/lisp.am
+++ b/lisp.am
@@ -15,6 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)

diff --git a/python.am b/python.am
index 8d4bb261f173a88d8160051b5e620503e06dd28a..5f1694c79d5d8cbe40a78c238b659ae944170a36 100644 (file)
--- a/python.am
+++ b/python.am
@@ -15,6 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 install-@DIR@PYTHON: $(@DIR@_PYTHON)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)

diff --git a/subdirs.am b/subdirs.am
index 0c0b0affc38b77f77ac812317478b8ff6b65b585..d96609ce414084c6b050505f96ba478fb6af14cc 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -16,6 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,