[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-25-g38cd6cb

[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=38cd6cb274a8766048373d37b89163fb5d4176ff

The branch, master has been updated
       via  38cd6cb274a8766048373d37b89163fb5d4176ff (commit)
      from  6128996ce3111b5fe1f7d879e11af37c44ee3a92 (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 38cd6cb274a8766048373d37b89163fb5d4176ff
Author: Eric Blake <address@hidden>
Date:   Tue Dec 4 06:43:29 2007 -0700

    Fix builds with OpenBSD make.
    
    * Makefile.am (HELP2MAN): New macro.
    (dist_man_MANS, doc/m4.1): Fix rules for building m4.1 into
    srcdir.
    * README: Update copyright.
    * HACKING: Mention help2man and makeinfo dependencies.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog   |    9 +++++++++
 HACKING     |   28 +++++++++++++++++++---------
 Makefile.am |    6 +++---
 README      |    2 +-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55ee2ea..af39595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-04  Eric Blake  <address@hidden>
+
+       Fix builds with OpenBSD make.
+       * Makefile.am (HELP2MAN): New macro.
+       (dist_man_MANS, doc/m4.1): Fix rules for building m4.1 into
+       srcdir.
+       * README: Update copyright.
+       * HACKING: Mention help2man and makeinfo dependencies.
+
 2007-11-29  Eric Blake  <address@hidden>
 
        Stage 4: route indir, builtin through ref; make argv opaque.
diff --git a/HACKING b/HACKING
index a92443b..d9b978b 100644
--- a/HACKING
+++ b/HACKING
@@ -61,20 +61,30 @@ and is not part of a release distribution.
   copy can be obtained by:
     git clone <savannah-user>@git.sv.gnu.org:/srv/git/m4.git
 
-* Before you can build from git, you need to bootstrap.  This requires a
-  pre-installed version of GNU M4 1.4.5 or later, built from a package;
-  Autoconf 2.60 or later; Automake 1.10a or later; CVS Head of Libtool
-  (will become Libtool 2.0); Gettext 0.16 or later; and a git checkout
-  of gnulib.  Gnulib can be obtained by:
-    git clone git://git.sv.gnu.org/gnulib.git
-  or
-    cvs -d:pserver:address@hidden:/srv/git/gnulib.git \
-      co -d gnulib HEAD
+* Before you can build from git, you need to bootstrap.  This requires:
+  - A pre-installed version of GNU M4 1.4.5 or later, built from a
+  package
+  - Autoconf 2.60 or later
+  - Automake 1.10a or later
+  - CVS Head of Libtool (will become Libtool 2.0)
+  - Gettext 0.16 or later
+  - Help2man 1.29 or later
+  - Texinfo 4.8 or later
+  - Any prerequisites of the above (such as perl, tex)
+  - A git checkout of gnulib.  A read-only copy of gnulib can be
+    obtained by:
+      git clone git://git.sv.gnu.org/gnulib.git
+    or
+      cvs -d:pserver:address@hidden:/srv/git/gnulib.git \
+        co -d gnulib HEAD
 
   If you are a member of the savannah group for gnulib, a read-write
   copy can be obtained by:
     git clone <savannah-user>@git.sv.gnu.org:/srv/git/gnulib.git
 
+  Note that none of these bootstrapping dependencies should be required
+  by a distributed release.
+
 * Either add the gnulib directory to your PATH, or run
     GNULIB_TOOL=path/to/gnulib/gnulib-tool ./bootstrap
 
diff --git a/Makefile.am b/Makefile.am
index 20fc3c5..57aba99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -254,10 +254,11 @@ ltdl/libltdlc.la:
 
 info_TEXINFOS  = doc/m4.texinfo
 doc_m4_TEXINFOS        = doc/regexprops-generic.texi doc/fdl.texi 
doc/gpl-3.0.texi
-dist_man_MANS  = doc/m4.1
+dist_man_MANS  = $(srcdir)/doc/m4.1
 EXTRA_DIST     += $(config_aux_dir)/gendocs.sh doc/gendocs_template
 MAINTAINERCLEANFILES += $(config_aux_dir)/gendocs.sh doc/gendocs_template \
                  doc/fdl.texi
+HELP2MAN       = $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run help2man
 
 # Build the man page once in the srcdir, rather than in every VPATH build
 # dir, to match how automake builds info pages.  This is safe for 'make
@@ -265,8 +266,7 @@ MAINTAINERCLEANFILES += $(config_aux_dir)/gendocs.sh 
doc/gendocs_template \
 $(srcdir)/doc/m4.1: configure.ac src/main.c
        @if test -f src/m4$(EXEEXT); then \
          echo "Updating the \`man' page \`$@'"; \
-         $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run \
-           help2man --name="macro processor" --source=FSF \
+         $(HELP2MAN) --name="macro processor" --source=FSF \
            --info-page=m4 --output=$@ src/m4$(EXEEXT); \
        else \
          echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
diff --git a/README b/README
index 58ccde1..390de38 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ set of tests.
 
 ========================================================================
 
-Copyright (C) 2000, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2000, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or


hooks/post-receive
--
GNU M4 source repository