groff-commit
[Top][All Lists]
Advanced

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

[groff] 01/01: Suppress "short revision", .Y register now contains the f


From: Bertrand Garrigues
Subject: [groff] 01/01: Suppress "short revision", .Y register now contains the full revision (including non-alphanumeric digits)
Date: Sun, 14 Jan 2018 17:43:50 -0500 (EST)

bgarrigues pushed a commit to branch unique-version
in repository groff.

commit 3dfd16ef3faf1d3bf137c629276c11aa528300e5
Author: Bertrand Garrigues <address@hidden>
Date:   Sun Jan 14 23:42:18 2018 +0100

    Suppress "short revision", .Y register now contains the full revision
    (including non-alphanumeric digits)
---
 Makefile.am             | 4 +---
 src/roff/troff/troff.am | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2090f73..7de03f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -634,12 +634,10 @@ endif
 # - From a tarball, the version is taken from .tarball-version
 #
 # REVISION is the full revision given by git-version-gen, which can
-# have non-alphanumeric symbols.  SHORT_REVISION is REVISION without
-# any non-alphanumeric symbols
+# have non-alphanumeric symbols.
 MAJOR_VERSION =`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'`
 MINOR_VERSION =`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'`
 REVISION = `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\(.*\)/\1/'`
-SHORT_REVISION = `echo $(VERSION) | sed 
's/[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/'`
 
 # Non-recursive makefile system. See Automake manual '7.3 An
 # Alternative Approach to Subdirectories'. We use a single Makefile.am
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 8b54df9..d9c2539 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -57,7 +57,7 @@ src/roff/troff/majorminor.cpp: $(top_srcdir)/.version
        @$(RM) $@
        @echo const char \*major_version = \"$(MAJOR_VERSION)\"\; >$@
        @echo const char \*minor_version = \"$(MINOR_VERSION)\"\; >>$@
-       @echo const char \*revision = \"$(SHORT_REVISION)\"\; >>$@
+       @echo const char \*revision = \"$(REVISION)\"\; >>$@
 
 
 ########################################################################



reply via email to

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