Re: [Groff] Automake now in master

[Ingo Schwarze]

Hi Bertrand,

Bertrand Garrigues wrote on Sat, Jan 31, 2015 at 12:33:09AM +0100:

> Therefore I've just merged the automake3 branch in master and removed
> the three branches that were used for this development (automake,
> automake2, automake3).  As discussed several times before the work was
> split for clarity purpose in several smaller commits.

It took me some more time to get round to testing than i thought,
but i finally did some.

I just tested the INSTALL.REPO bootstrapping procedure and "make
dist" on OpenBSD 5.7-release (to be released on May 1, 2015).  It
works.  I then updated the OpenBSD port to use the resulting groff
distribution tarball (of course, i'm not going to commit the updated
port until you officially release a new version of groff).  The
build and install work as well.  I'm now using that updated port
for all of my own work.  I ran the mandoc test suite with the so
installed version of groff, and i formatted all 4974 OpenBSD manuals
(including X.org and ncurses, which also somewhat exercises eqn(1)
and tbl(1)) with the so installed version of groff and diffed the
results.

I see no regressions so far.

Below is a minor documentation patch.  I suspect that somehow,
conflict markers inadvertently crept into that file.

Thank you again for your good work,
  Ingo


diff --git a/INSTALL.REPO b/INSTALL.REPO
index 75922a2..37949e8 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -56,12 +56,8 @@ the `config.status' script; it is the `config.status' script 
generates
 the Makefile) and call 'make' to build the groff project. You can do
 it in the source tree:
 
-<<<<<<< HEAD
-To update file `aclocal.m4', run the shell command
-=======
     $ ./configure
     $ make
->>>>>>> Fixes after final complete tests:
 
 You can also build groff in an out of source build tree, which is cleaner:
 
@@ -89,10 +85,6 @@ Just ignore this.  It doesn't occur in the actual versions of
 `autoreconf'.
 
 
-<<<<<<< HEAD
-    $ autoconf -I m4
-=======
->>>>>>> Fixes after final complete tests:
 
 2. Modification of autotools files
 ----------------------------------
@@ -117,15 +109,3 @@ groff is available in doc/automake.mom. It is currently not
 automatically generated, to build it:
 
 pdfmom automake.mom > automake.pdf
-
-<<<<<<< HEAD
-After the use of the `GNU autotools', the usual compilation should
-work.  If the run of `configure' produces error reports you have
-produced errors in the `autotools' modification.
-
-##### Emacs settings
-Local Variables:
-mode: text
-End:
-=======
->>>>>>> Fixes after final complete tests: