groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 43/46: Added a short explanation in INSTALL.REPO on autotools ve


From: Bertrand Garrigues
Subject: [groff] 43/46: Added a short explanation in INSTALL.REPO on autotools versions, for systems that supports multiple autotools versions.
Date: Sat, 29 Nov 2014 19:47:42 +0000

bgarrigues pushed a commit to branch automake3
in repository groff.

commit f10497886558eb4c6eae3edaf4c4f8dae7133ec1
Author: Bertrand Garrigues <address@hidden>
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 <address@hidden>.
---
 INSTALL.REPO               |   10 ++++++++++
 contrib/groffer/groffer.am |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/INSTALL.REPO b/INSTALL.REPO
index 6e2a5c1..75922a2 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -16,6 +16,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 f955017..4f7771f 100644
--- a/contrib/groffer/groffer.am
+++ b/contrib/groffer/groffer.am
@@ -84,7 +84,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/address@hidden@]/'"$$FILEMODE"'/g' 
$(groffer_srcdir)/roff2.man > $@;
 
 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]