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

 2014-11-10  Glenn Morris  <rgm@gnu.org>
 
+	* 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.

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

admin/ChangeLog

 2014-11-10  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
 

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)

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

doc/man/ChangeLog

+2014-11-10  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.1.in: Rename from emacs.1.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
 	* Merge in all changes up to 24.4 release.

doc/man/emacs.1 → doc/man/emacs.1.in

 .\" 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.

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.