From be1f31616a1e0db3764da6ab3a22e04f913a25ab Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 9 Nov 2014 18:01:56 -0800 Subject: [PATCH] Further reduce the number of versioned files storing the version number * configure.ac (doc/man/emacs.1): Generate it. * Makefile.in (top_bootclean): Remove doc/man/emacs.1. * make-dist: Do not distribute doc/man/emacs.1. * admin/admin.el (set-version): No need to update doc/man/emacs.1. * doc/man/emacs.1.in: Rename from emacs.1. * .bzrignore: Add doc/man/emacs.1. --- ChangeLog | 4 ++++ Makefile.in | 2 +- admin/ChangeLog | 2 ++ admin/admin.el | 4 ---- configure.ac | 3 +++ doc/man/ChangeLog | 4 ++++ doc/man/{emacs.1 => emacs.1.in} | 4 ++-- make-dist | 5 +++-- 8 files changed, 19 insertions(+), 9 deletions(-) rename doc/man/{emacs.1 => emacs.1.in} (99%) diff --git a/ChangeLog b/ChangeLog index 1d94222f64b..f2ac1322281 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-11-10 Glenn Morris + * configure.ac (doc/man/emacs.1): Generate it. + * Makefile.in (top_bootclean): Remove doc/man/emacs.1. + * make-dist: Do not distribute doc/man/emacs.1. + * configure.ac (etc/refcards/emacsver.tex): Generate it. * Makefile.in (etc-emacsver): New PHONY rule. (bootstrap-clean): Delete etc/refcards/emacsver.tex. diff --git a/Makefile.in b/Makefile.in index 458904710e0..3c389b6e837 100644 --- a/Makefile.in +++ b/Makefile.in @@ -822,7 +822,7 @@ clean: $(clean_dirs:=_clean) ### `bootclean' ### Delete all files that need to be remade for a clean bootstrap. top_bootclean=\ - rm -f config.cache config.log + rm -f config.cache config.log ${srcdir}/doc/man/emacs.1 ### `distclean' ### Delete all files from the current directory that are created by diff --git a/admin/ChangeLog b/admin/ChangeLog index 435ea32b270..17de5a49902 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,7 @@ 2014-11-10 Glenn Morris + * admin.el (set-version): No need to update doc/man/emacs.1. + * admin.el (set-version): No need to update etc/refcards/emacsver.tex. (set-copyright): Update etc/refcards/emacsver.tex.in. diff --git a/admin/admin.el b/admin/admin.el index 63b0d190c80..b22160ef478 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -94,10 +94,6 @@ Root must be the root of an Emacs source tree." (rx (and "AC_INIT" (1+ (not (in ?,))) ?, (0+ space) (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "doc/man/emacs.1" version - (rx (and ".TH EMACS" (1+ not-newline) - "GNU Emacs" (1+ space) - (submatch (1+ (in "0-9.")))))) ;; No longer used, broken in multiple ways, updating version seems pointless. (set-version-in-file root "nt/config.nt" version (rx (and bol "#" (0+ blank) "define" (1+ blank) diff --git a/configure.ac b/configure.ac index 819d6077592..b2b98a0936b 100644 --- a/configure.ac +++ b/configure.ac @@ -5111,6 +5111,9 @@ if test "$HAVE_NS" = "yes"; then AC_SUBST(ns_check_file) fi +dnl config.status treats $srcdir specially, so I think this is ok... +AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) + dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES. dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory dnl using automake (ie lib/) is explicitly listed and not "hidden" in a variable diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index b73bf74e2a6..ad220a33898 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2014-11-10 Glenn Morris + + * emacs.1.in: Rename from emacs.1. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/doc/man/emacs.1 b/doc/man/emacs.1.in similarity index 99% rename from doc/man/emacs.1 rename to doc/man/emacs.1.in index 6ad6ee1030b..fc7be71f284 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1.in @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 25.0.50" +.TH EMACS 1 "2007 April 13" "GNU Emacs @version@" . . .SH NAME @@ -579,7 +579,7 @@ They are stored here to reduce the size of Emacs proper. . . .SH BUGS -There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs +There is a mailing list, @PACKAGE_BUGREPORT@, for reporting Emacs bugs and fixes. But before reporting something as a bug, please try to be sure that it really is a bug, not a misunderstanding or a deliberate feature. diff --git a/make-dist b/make-dist index bbb0f95bb4c..45df561ce13 100755 --- a/make-dist +++ b/make-dist @@ -503,8 +503,9 @@ echo "Making links to \`doc/lispintro'" echo "Making links to \`doc/man'" (cd doc/man - ln ChangeLog* *.1 ../../${tempdir}/doc/man - cd ../../${tempdir}/doc/man) + ln ChangeLog* *.1 *.in ../../${tempdir}/doc/man + cd ../../${tempdir}/doc/man + rm -f emacs.1) ### It would be nice if they could all be symlinks to top-level copy, but ### you're not supposed to have any symlinks in distribution tar files. -- 2.39.5