[groff] 01/01: Revert "Update .version file more aggressively."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 450179efd63dc4e5a6dee0fed52d8d4a442b8ae1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Mar 22 22:28:11 2022 +1100

    Revert "Update .version file more aggressively."
    
    This reverts commit c1bb33e5beec25b4059bca3cc4529b738ec486c7.
    
    This wasn't the right way to attack the problem; see
    <https://lists.gnu.org/archive/html/groff/2022-03/msg00051.html>.
---
 ChangeLog   | 19 -------------------
 Makefile.am | 13 ++-----------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57ce743d..43ff2312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4952,25 +4952,6 @@
 
        Fixes <https://savannah.gnu.org/bugs/?61068>.
 
-2021-08-21  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       Update .version file more aggressively.
-
-       * Makefile.am: Regenerate a temporary version string file on
-       every build, but update the real version file's mtime only if
-       its contents change.
-       (.version.tree): New target.  Mark it phony, populating it with
-       `$(VERSION)` with every `make` if the `.tarball-version` file
-       {created by `dist-hook`} doesn't exist.
-       ($(top_srcdir)/.version): Depend on foregoing target.  If the
-       tarball version file and the target do not exist, copy `.tree`
-       file into place.  Compare this file with `.tree` file; if they
-       differ, move the `.tree` file to this one.
-       (MOSTLYCLEANFILES): Add `.version.tree`.
-
-       Fixes <https://savannah.gnu.org/bugs/?61052>.  Thanks to Bjarni
-       Ingi Gislason for the report.
-
 2021-08-21  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [libgroff]: Rename font class member variable.
diff --git a/Makefile.am b/Makefile.am
index 483efe46..a4ef0e95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -924,17 +924,8 @@ SUFFIXES += .man
 # Version files - see script 'build-aux/git-gen-version'
 EXTRA_DIST += $(top_srcdir)/.version
 BUILT_SOURCES += $(top_srcdir)/.version
-# Regenerate a temporary version string file on every build, but update
-# the real version file's mtime only if its contents change.
-.PHONY: .version.tree
-.version.tree:
-       @test -f $(distdir)/.tarball-verion || echo $(VERSION) > $@
-$(top_srcdir)/.version: .version.tree
-       @if ! test -f $(distdir)/.tarball-version; then \
-         test -f $@ || cp .version.tree $@; \
-         cmp -s .version.tree $@ || cp .version.tree $@; \
-       fi
-MOSTLYCLEANFILES += .version.tree
+$(top_srcdir)/.version:
+       echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version