bgarrigues pushed a commit to branch automake2
in repository groff.
commit 6fc29b0ceb5494c18ca77047e4194568eae97e42
Author: Bertrand Garrigues <[email protected]>
Date: Tue Sep 23 00:23:32 2014 +0200
- Added a short explanation in INSTALL.REPO on autotools versions, for
systems that supports multiple autotools versions.
- Regexp in contrib/groffer/groffer.am:
Basic regular expressions don't have a "+" bound.
Both issues pointed out by Ingo Schwarze <[email protected]>
---
INSTALL.REPO | 10 ++++++++++
contrib/groffer/groffer.am | 2 +-
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/INSTALL.REPO b/INSTALL.REPO
index c397e02..953ee2a 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -17,6 +17,16 @@ need them only if you want to build groff from the git
repository.
1. Initial build
----------------
+You will need autoconf version and 2.65 or higher and automake version
+1.12.2 or higher. These minimal versions are set in the bootstrap.conf
+file.
+
+On operating systems supporting concurrent installation of multiple
+versions of the autotools, set the following environment variables:
+
+ export AUTOMAKE_VERSION=1.12
+ export AUTOCONF_VERSION=2.65
+
First invoke the bootstrap script:
$ ./bootstrap
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
index 3c0615e..1b5c522 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -85,7 +85,7 @@ $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
# (dvi, pdf, html etc ...)
$(ROFF2MAN): $(groffer_srcdir)/roff2.man
@$(MKDIR_P) contrib/groffer
- FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z]\+\)\.man|\1|g'`
\
+ FILEMODE=`echo $@ | sed
's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \
&& sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g'
$(groffer_srcdir)/roff2.man > $@;
groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
