[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-338-gf70f056

[Gary V. Vaughan]

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=f70f0564a3a3a0c7c4590107e1a4107465efabb9

The branch, master has been updated
       via  f70f0564a3a3a0c7c4590107e1a4107465efabb9 (commit)
      from  6518b81d286f9f57169d68af68567be21a359189 (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 f70f0564a3a3a0c7c4590107e1a4107465efabb9
Author: Pavel Raiskup <address@hidden>
Date:   Fri Nov 21 19:47:26 2014 +0000

    configury: ensure m4 is built before calling help2man on it.
    
    Moving the 'doc' related Makefile targets into doc/Makefile.am to
    avoid building manual page before the m4 binary itself (suggested
    by automake.info).
    * Makefile.am (SUBDIRS): Add doc subdir.
    * Makefile.am: Move to docs-related rules from here...
    * doc/Makefile.am: New file. ...to here.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 Makefile.am     |   17 +----------------
 configure.ac    |    1 +
 doc/Makefile.am |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 doc/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7e3f1d8..601d8eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 config_aux_dir = build-aux
 config_macro_dir= $(config_aux_dir)/m4
 
-SUBDIRS                = po m4/gnu . tests/gnu
+SUBDIRS                = po m4/gnu . doc tests/gnu
 
 ACLOCAL_AMFLAGS = -I build-aux/m4
 AUTOMAKE_OPTIONS = nostdinc
@@ -259,21 +259,6 @@ EXTRA_DIST     += m4/system_.h
 ## Documentation. ##
 ## -------------- ##
 
-info_TEXINFOS  = doc/m4.texi
-m4_TEXINFOS    = doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi
-dist_man_MANS  = $(srcdir)/doc/m4.1
-EXTRA_DIST     += doc/gendocs_template
-MAINTAINERCLEANFILES += doc/gendocs_template
-HELP2MAN       = $(SHELL) $(top_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
-# distcheck' since it is distributed pre-built.
-$(srcdir)/doc/m4.1: .version $(srcdir)/src/main.c
-       @echo "Updating the \`man' page \`$@'"; \
-       $(HELP2MAN) --name="macro processor" --source=FSF \
-         --info-page=m4 --output=$@ src/m4$(EXEEXT)
-
 TAGS_FILES     = $(infos_TEXINFOS)
 TAGS_DEPENDENCIES = $(TAGS_FILES)
 ETAGS_ARGS     = --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
diff --git a/configure.ac b/configure.ac
index c32d0cf..35cd37d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,6 +291,7 @@ M4_SYSCMD
 ## -------- ##
 AC_CONFIG_FILES([
 Makefile
+doc/Makefile
 m4/gnu/Makefile
 m4/system.h:m4/system_.h
 tests/atlocal
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..13d8539
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,38 @@
+## Makefile.am - template for generating Makefile via Automake
+##
+## Copyright (C) 2000-2001, 2003-2010, 2013-2014 Free Software
+## Foundation, Inc.
+##
+## This file is part of GNU M4.
+##
+## GNU M4 is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## GNU M4 is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+## Written by Gary V. Vaughan <address@hidden>
+
+config_aux_dir = build-aux
+
+info_TEXINFOS  = m4.texi
+m4_TEXINFOS    = regexprops-generic.texi fdl-1.3.texi gpl-3.0.texi
+dist_man_MANS  = $(srcdir)/m4.1
+EXTRA_DIST     = gendocs_template
+MAINTAINERCLEANFILES = gendocs_template
+HELP2MAN       = $(SHELL) $(top_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
+# distcheck' since it is distributed pre-built.
+$(srcdir)/m4.1: $(top_srcdir)/.version $(top_srcdir)/src/main.c
+       @echo "Updating the \`man' page \`$@'"; \
+       $(HELP2MAN) --name="macro processor" --source=FSF \
+         --info-page=m4 --output=$@ $(top_srcdir)/src/m4$(EXEEXT)


hooks/post-receive
-- 
GNU M4 source repository