diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | HACKING | 24 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 8 |
4 files changed, 29 insertions, 13 deletions
@@ -1,3 +1,11 @@ +2007-12-04 Eric Blake <ebb9@byu.net> + + Fix builds with OpenBSD make. + * doc/Makefile.am (HELP2MAN): New macro. + (man_MANS, m4.1): Fix rules for building m4.1 into srcdir. + * README: Update copyright. + * HACKING: Mention help2man and makeinfo dependencies. + 2007-11-29 Eric Blake <ebb9@byu.net> Stage 4: route indir, builtin through ref; make argv opaque. @@ -40,19 +40,27 @@ and is not part of a release distribution. * The master M4 repository is stored in git. -* Before you can build from git, you need to bootstrap. This requires a - pre-installed version of GNU M4 built from a package, Autoconf 2.60 or - later, Automake 1.9.6 or later, and 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:anonymous@pserver.git.sv.gnu.org:/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 built from a package + - Autoconf 2.60 or later + - Automake 1.9.6 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:anonymous@pserver.git.sv.gnu.org:/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 @@ -47,7 +47,7 @@ solution, from which the problem might be uneasy to infer. ======================================================================== -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 diff --git a/doc/Makefile.am b/doc/Makefile.am index ded347f6..b5cd3605 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,10 +21,11 @@ info_TEXINFOS = m4.texinfo m4_TEXINFOS = fdl.texi gpl-3.0.texi -man_MANS = m4.1 +man_MANS = $(srcdir)/m4.1 EXTRA_DIST = $(man_MANS) gendocs_template MAINTAINERCLEANFILES = $(man_MANS) gendocs_template SUFFIXES = .1 +HELP2MAN = $(SHELL) $(top_srcdir)/build-aux/missing --run help2man # Depend on configure.ac for version, m4.c for usage text. Do not depend on # built m4 executable, since not everyone has help2man or perl. @@ -34,9 +35,8 @@ SUFFIXES = .1 $(srcdir)/m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c @if test -x ../src/m4$(EXEEXT) ; then \ echo "Updating man page m4.1" ; \ - $(SHELL) $(top_srcdir)/build-aux/missing --run \ - help2man --name="macro processor" --source=FSF \ - --info-page=m4 --output=$@ ../src/m4$(EXEEXT) ; \ + $(HELP2MAN) --name="macro processor" --source=FSF \ + --info-page=m4 --output=$@ ../src/m4$(EXEEXT) ; \ else \ echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \ echo " Retry once the program executable is ready."; \ |