[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1-27-g5df23a7

[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 Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=5df23a7accb0e82109898f02818c2f65a0bb7b91

The branch, maint has been updated
       via  5df23a7accb0e82109898f02818c2f65a0bb7b91 (commit)
       via  6a67b29744ba72ff9ed6a12349a65b1e4a23f3a6 (commit)
       via  a5ebf351f7d41aff1e3716930d687096b3d4475d (commit)
      from  654324c756210161c61484f754a1df77aa748a78 (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 5df23a7accb0e82109898f02818c2f65a0bb7b91
Author: Karl Berry <address@hidden>
Date:   Thu Jan 3 16:09:23 2013 -0700

    docs: mention dist-hook help for EXTRA_DIST
    
    * automake.texi (Basics of Distribution): mention dist-hook
    as working around the problems of whole directories in EXTRA_DIST.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 6a67b29744ba72ff9ed6a12349a65b1e4a23f3a6
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 3 23:10:42 2013 +0100

    texi: remove workaround for older Texinfo (4.1)
    
    * lib/am/texibuild.am: Here, in the rules generating HTML output.
    We can do so because, since Automake 1.13, we require Texinfo >= 4.9
    anyway.
    
    Basically a backport of Automake-NG commit '1.12.2-879-ge6caf5e'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit a5ebf351f7d41aff1e3716930d687096b3d4475d
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 3 19:02:52 2013 +0100

    NEWS: improve wordings in entry deprecating suffix-less info files
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                |   10 +++++++++-
 doc/automake.texi   |    4 +++-
 lib/am/texibuild.am |   10 ++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index b8106ad..02a34df 100644
--- a/NEWS
+++ b/NEWS
@@ -53,7 +53,15 @@ New in 1.13.2:
 
   - Use of suffix-less info files (that can be specified through the
     '@setfilename' macro in Texinfo input files) is discouraged, and
-    its use will raise warnings in the 'obsolete' category.
+    its use will raise warnings in the 'obsolete' category.  Simply
+    use the '.info' extension for all your info files, transforming
+    usages like:
+
+        @setfilename myprogram
+
+    into:
+
+        @setfilename myprogram.info
 
   - Use of Texinfo input files with '.txi' or '.texinfo' extensions
     is discouraged, and its use will raise warnings in the 'obsolete'
diff --git a/doc/automake.texi b/doc/automake.texi
index e53a2e5..8ace5e5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8418,7 +8418,9 @@ You can also mention a directory in @code{EXTRA_DIST}; in 
this case the
 entire directory will be recursively copied into the distribution.
 Please note that this will also copy @emph{everything} in the directory,
 including, e.g., Subversion's @file{.svn} private directories or CVS/RCS
-version control files.  We recommend against using this feature.
+version control files; thus we recommend against using this feature
+as-is.  However, you can use the @code{dist-hook} feature to
+ameliorate the problem; @pxref{The dist Hook}.
 
 @vindex SUBDIRS
 @vindex DIST_SUBDIRS
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 3256fde..a59d443 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -110,15 +110,9 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
 ?GENERIC?       -o $(@:.html=.htp) %SOURCE%; \
 ?!GENERIC?      -o $(@:.html=.htp) `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%; \
        then \
-         rm -rf $@; \
-## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
-## instead of foo.html/).
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+         rm -rf $@ && mv $(@:.html=.htp) $@; \
        else \
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-         exit 1; \
+         rm -rf $(@:.html=.htp); exit 1; \
        fi
 
 ## If we are using the generic rules, we need separate dependencies.


hooks/post-receive
-- 
GNU Automake