[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: manpages have a dirty version
From: |
Jim Meyering |
Subject: |
Re: manpages have a dirty version |
Date: |
Sat, 26 Jan 2008 16:05:34 +0100 |
Sven Joachim <address@hidden> wrote:
> Not a big deal, but I thought I'd mention it anyway: the manpages in
> coreutils 6.10 show up the version as
>
> GNU coreutils 6.9.92.4-f088d-dirty
>
> which does not leave a very good impression; regenerating the manpages
> when making a stable release seems to be a good idea.
Thanks for reporting that.
The problem is that man/Makefile.am depended on configure.ac
for version string changes. However, the version string is no
longer recorded in that file, so the dependency was nearly useless.
Here's the fix:
2008-01-26 Jim Meyering <address@hidden>
Ensure that each version string change propagates to man pages.
* man/Makefile.am (common_dep): Don't depend on configure.ac for
version changes. Instead, depend on ../VERSION.
(../VERSION): New rule.
* Makefile.am (DISTCLEANFILES): Define.
* GNUmakefile: Update ./VERSION.
* .gitignore: List VERSION.
Reported by Sven Joachim.
diff --git a/.gitignore b/.gitignore
index 6b00458..f5ba5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ INSTALL
Makefile
Makefile.in
THANKS-to-translators
+VERSION
aclocal.m4
autom4te.cache
config.cache
diff --git a/GNUmakefile b/GNUmakefile
index 3dc6f15..9502203 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,7 +4,7 @@
# It is necessary if you want to build targets usually of interest
# only to the maintainer.
-# Copyright (C) 2001, 2003, 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2008 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@ ifeq (0,$(MAKELEVEL))
ifneq ($(_curr-ver),$(VERSION))
$(info INFO: running autoreconf for new version string: $(_curr-ver))
dummy := $(shell rm -rf autom4te.cache; autoreconf)
+ dummy := $(shell echo $(_curr-ver) > VERSION)
endif
endif
endif
diff --git a/Makefile.am b/Makefile.am
index 5f9f21a..56f7b85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
# Make coreutils. -*-Makefile-*-
-# Copyright (C) 1990, 1993-2007 Free Software Foundation, Inc.
+# Copyright (C) 1990, 1993-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -76,6 +76,7 @@ dist-hook:
distcheck-hook:
$(MAKE) my-distcheck
+DISTCLEANFILES = VERSION
MAINTAINERCLEANFILES = THANKS-to-translators
THANKS-to-translators: po/LINGUAS THANKStt.in
( \
diff --git a/man/Makefile.am b/man/Makefile.am
index b7b960e..6cad1a4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
# Make coreutils man pages. -*-Makefile-*-
-# Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@ man_aux = $(dist_man_MANS:.1=.x)
EXTRA_DIST = $(man_aux) $(NO_INSTALL_PROGS_DEFAULT:%=%.x) help2man
MAINTAINERCLEANFILES = $(dist_man_MANS)
-# Depend on configure.ac to get version number changes.
-common_dep = $(top_srcdir)/configure.ac
+# Depend on ../VERSION to get version number changes.
+common_dep = ../VERSION
# Note that arch depends on uname.c
arch.1: $(common_dep) $(srcdir)/arch.x ../src/uname.c
@@ -198,3 +198,6 @@ check-programs-vs-x:
|| { echo missing $$p.x 1>&2; status=1; }; \
done; \
exit $$status
+
+../VERSION:
+ echo $(VERSION) > address@hidden && mv address@hidden $@
--
1.5.4.rc4.26.g228a