gbranden pushed a commit to branch master
in repository groff.

commit 3824c1529b429575230bc29aef41b1283f66414d
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Jan 26 14:09:57 2026 -0600

    Revert "Makefile.am: Clean up distribution archive."
    
    This reverts commit 9fdb52a9cc805d7d5d42895e5a71b72d64e78e38.
    
    This change was spurious; the correct solution was to roll the
    distribution archive _after_ generating the corresponding Git tag, not
    before.  Commenting out these variables broke an in-tree "make dist".
    
    Continues fixing <https://savannah.gnu.org/bugs/?67933>.
---
 ChangeLog   | 8 --------
 Makefile.am | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f7b0f11e..3252177c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,14 +150,6 @@
 
        Fixes <https://savannah.gnu.org/bugs/?44530>.
 
-2026-01-19  G. Branden Robinson <[email protected]>
-
-       * Makefile.am: Stop adding ".version" file to the `EXTRA_DIST`
-       and `BUILT_SOURCES` macros.
-
-       Fixes <https://savannah.gnu.org/bugs/?67933>.  Thanks to Colin
-       Watson for the report.
-
 2026-01-20  Deri James  <[email protected]>
 
        * src/devices/gropdf/gropdf.1.man: Update copyright.
diff --git a/Makefile.am b/Makefile.am
index 3746ff563..f83497841 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -870,8 +870,8 @@ SUFFIXES += .man
             >$@
 
 # Version files - see script "build-aux/git-version-gen".
-#EXTRA_DIST += $(top_srcdir)/.version
-#BUILT_SOURCES += $(top_srcdir)/.version
+EXTRA_DIST += $(top_srcdir)/.version
+BUILT_SOURCES += $(top_srcdir)/.version
 $(top_srcdir)/.version:
        echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:

_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to