[SCM] GNU Autoconf source repository branch, master, updated. v2.68-122-g0383261

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=0383261176c8c91375a07159409a07d3ab3519f6

The branch, master has been updated
       via  0383261176c8c91375a07159409a07d3ab3519f6 (commit)
       via  ff2060231a616834908e85f8a24ffab50172a6b4 (commit)
      from  f4be358c2b97736cda5a0d543fa3d34d3cde40bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0383261176c8c91375a07159409a07d3ab3519f6
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jan 18 19:08:18 2012 +0100

    getopt: sync from Automake repository
    
    * lib/Autom4te/Getopt.am: The master copy of this file has
    been moved to the  Automake repository (see Automake commit
    'v1.11-662-g52246cc' 2012-01-18, "cmdline parsing: move into
    a dedicated perl module").  So we now we sync it from there,
    by listing it ...
    * cfg.mk (autom4te_files): ... in this variable.

commit ff2060231a616834908e85f8a24ffab50172a6b4
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jan 20 18:03:37 2012 +0100

    build: fix automake error due to missing ChangeLog
    
    Apparently, Automake does not accept the '$(srcdir)/ChangeLog'
    target in Makefile.am as a declaration that ChangeLog is
    automatically generated (and thus does not need to exist at
    automake time).  One has to use a *literal* 'ChangeLog' target.
    
    Problem introduced in commit v2.68-118-g6ed5195 of 2012-01-17,
    "maint: generate ChangeLog from git log".
    
    * Makefile.ma ($(srcdir)/ChangeLog): Renamed ...
    (ChangeLog): ... to this.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am            |    2 +-
 cfg.mk                 |    1 +
 lib/Autom4te/Getopt.pm |    3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5bf4cb5..7608874 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ gen-ChangeLog:
 # bootstrap.  Creates a dummy ChangeLog (unless one is already present,
 # as might be the case for users of vc-dwim) that will be overridden
 # with a proper one at distribution time.
-$(srcdir)/ChangeLog:
+ChangeLog:
        @echo dummy > $@
 
 # Version string management.  There are two files to be aware of:
diff --git a/cfg.mk b/cfg.mk
index f14737e..6eb2fa4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -82,6 +82,7 @@ autom4te_files = \
   Autom4te/Configure_ac.pm \
   Autom4te/Channels.pm \
   Autom4te/FileUtils.pm \
+  Autom4te/Getopt.pm \
   Autom4te/Struct.pm \
   Autom4te/XFile.pm
 
diff --git a/lib/Autom4te/Getopt.pm b/lib/Autom4te/Getopt.pm
index 77f21db..f3fdf68 100644
--- a/lib/Autom4te/Getopt.pm
+++ b/lib/Autom4te/Getopt.pm
@@ -26,7 +26,7 @@ Autom4te::Getopt - GCS conforming parser for command line 
options
 =head1 DESCRIPTION
 
 Export a function C<parse_options>, performing parsing of command
-line options in conformance to the GNU Conding standards.
+line options in conformance to the GNU Coding standards.
 
 =cut
 
@@ -85,7 +85,6 @@ sub parse_options (%)
                 . "Try `$0 --help' for more information.");
        }
     }
-
 }
 
 =back


hooks/post-receive
-- 
GNU Autoconf source repository