[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-105-ge31b307

[Eric Blake]

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 M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=e31b307a840d5b7fd3abd18b01595295b26fcd4f

The branch, branch-1.6 has been updated
       via  e31b307a840d5b7fd3abd18b01595295b26fcd4f (commit)
       via  e7aa53f1c925806d15d0c71292c29e8a705cc72f (commit)
      from  7d77c79ea2e7a98834ee3113c8485feae43f4acf (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 e31b307a840d5b7fd3abd18b01595295b26fcd4f
Author: Eric Blake <address@hidden>
Date:   Tue Mar 3 16:35:06 2009 -0700

    Try to tolerate spaces in directory names in testsuite.
    
    * doc/m4.texinfo (Diversions, Using frozen files): Provide shell
    quoting, in case __program__ contains spaces.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit e94228df28e881da59dd86bfb513ad9d07ca392a)

commit e7aa53f1c925806d15d0c71292c29e8a705cc72f
Author: Eric Blake <address@hidden>
Date:   Wed Mar 4 06:29:28 2009 -0700

    Improve web-manual maintainer rule.
    
    * maint.mk (web-manual): Work with VPATH builds.  Factor
    package-specific detail...
    * cfg.mk (manual_title): ...to new variable.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit 39a8eb3846b65914fecf7b4f981e1dd029de1f5c)

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

Summary of changes:
 ChangeLog      |   11 +++++++++++
 cfg.mk         |    5 ++++-
 doc/m4.texinfo |   12 ++++++------
 maint.mk       |    4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 375eaa0..203fb13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-04  Eric Blake  <address@hidden>
+
+       Try to tolerate spaces in directory names in testsuite.
+       * doc/m4.texinfo (Diversions, Using frozen files): Provide shell
+       quoting, in case __program__ contains spaces.
+
+       Improve web-manual maintainer rule.
+       * maint.mk (web-manual): Work with VPATH builds.  Factor
+       package-specific detail...
+       * cfg.mk (manual_title): ...to new variable.
+
 2009-02-26  Eric Blake  <address@hidden>
 
        Make bootstrap easier on Solaris.
diff --git a/cfg.mk b/cfg.mk
index 99abe29..a67d088 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,9 @@ gnu_ftp_host-beta = alpha.gnu.org
 gnu_ftp_host-major = ftp.gnu.org
 gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
 
+# Used in maint.mk's web-manual rule
+manual_title = GNU macro processor
+
 url_dir_list = ftp://$(gnu_rel_host)/gnu/m4
 
 # The GnuPG ID of the key used to sign the tarballs.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 47549e8..c558653 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5703,7 +5703,7 @@ ifdef(`__unix__', ,
 ')m4exit(`77')')dnl
 changequote(`[', `]')dnl
 syscmd([echo 'divert(1)hi
-format(%1000000d, 1)' | ]__program__[ | sed -n 1p])dnl
+format(%1000000d, 1)' | ']__program__[' | sed -n 1p])dnl
 @result{}hi
 sysval
 @result{}0
@@ -7924,9 +7924,9 @@ ifdef(`__unix__', ,
 ')m4exit(`77')')dnl
 changequote(`[', `]')dnl
 syscmd([echo 'changequote([,])pushdef([divnum],[hi])dnl' \
-       | ]__program__[ -F in.m4f \
+       | ']__program__[' -F in.m4f \
      && echo 'divnum popdef([divnum])divnum' \
-       | ]__program__[ -R in.m4f])status sysval
+       | ']__program__[' -R in.m4f])status sysval
 @result{}hi 0
 @result{}status 0
 syscmd([rm -f in.m4f])sysval
@@ -7954,9 +7954,9 @@ ifdef(`__unix__', ,
 ')m4exit(`77')')dnl
 changequote(`[', `]')dnl
 syscmd([printf 'define(-\0-,\0-\0)changequote([,\0])changecom(--\0)dnl
-divert(1)undivert(null.out)' | ]__program__[ -F in.m4f \
+divert(1)undivert(null.out)' | ']__program__[' -F in.m4f \
      && printf 'errprint([divnum\0] #-- len(indir(-\0-)))' \
-       | ]__program__[ -R in.m4f])errprint([ ]sysval[
+       | ']__program__[' -R in.m4f])errprint([ ]sysval[
 ])dnl
 @error{}divnum #-- 3 0
 syscmd([rm -f in.m4f])errprint(sysval[
@@ -7972,7 +7972,7 @@ ifdef(`__unix__', ,
 ')m4exit(`77')')dnl
 changequote(`[', `]')dnl
 syscmd([printf '#bogus\nV1\nF3,4\nlenlen\0\n' > in.m4f \
-     && ]__program__[ -R in.m4f])sysval
+     && ']__program__[' -R in.m4f])sysval
 @error{}m4:in.m4f:4: ill-formed frozen file, invalid builtin `len\0' 
encountered
 @result{}1
 syscmd([rm -f in.m4f])sysval
diff --git a/maint.mk b/maint.mk
index 9c4539e..5fa32a5 100644
--- a/maint.mk
+++ b/maint.mk
@@ -194,6 +194,6 @@ delta-diff: prev-tarball new-tarball
 web-manual:
        @cd '$(srcdir)/doc' ; \
          $(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
-            --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
-           "$(PACKAGE_NAME) - GNU macro processor"
+           --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
+           "$(PACKAGE_NAME) - $(manual_title)"
        @echo " *** Upload the doc/manual directory to web-cvs."


hooks/post-receive
--
GNU M4 source repository