# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1229199128 0
# Node ID a33d5ccc39337031c93fd16d8c5fece7e927f17c
# Parent  3378a375ce49caa4b8995aba63ef0f40d348c3ff
(manext): Remove variable.
(MAN_PAGES): New variable.
(install-arch-indep, uninstall): Use MAN_PAGES for list of files to add
and remove.

diff -r 3378a375ce49 -r a33d5ccc3933 ChangeLog
--- a/ChangeLog	Sat Dec 13 19:28:31 2008 +0000
+++ b/ChangeLog	Sat Dec 13 20:12:08 2008 +0000
@@ -1,6 +1,10 @@
 2008-12-13  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (install-arch-indep): Add new man-pages.
+	(manext): Remove variable.
+	(MAN_PAGES): New variable.
+	(install-arch-indep, uninstall): Use MAN_PAGES for list of files to add
+	and remove.
 
 2008-12-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff -r 3378a375ce49 -r a33d5ccc3933 Makefile.in
--- a/Makefile.in	Sat Dec 13 19:28:31 2008 +0000
+++ b/Makefile.in	Sat Dec 13 20:12:08 2008 +0000
@@ -125,10 +125,14 @@
 # data.	 ${archlibdir} is a subdirectory of this.
 libexecdir=@libexecdir@
 
-# Where to install Emacs's man pages, and what extension they should have.
+# Where to install Emacs's man pages.
+# This used to allow choice of the numeric extension, but this made
+# little sense since the files were always installed in man1/
+# (and they contain cross-references that expect them to be there).
 mandir=@mandir@
-manext=.1
 man1dir=$(mandir)/man1
+MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
+          grep-changelog.1 rcs-checkin.1
 
 # Where to install and expect the info files describing Emacs.	In the
 # past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but
@@ -571,10 +575,10 @@
 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
 	thisdir=`/bin/pwd`; \
 	cd ${mansrcdir}; \
-	for page in b2m ctags ebrowse emacs emacsclient etags grep-changelog rcs-checkin; do \
+	for page in ${MAN_PAGES}; do \
 	  (cd $${thisdir}; \
-	   ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
-	   chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
+	   ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
+	   chmod a+r $(DESTDIR)${man1dir}/$${page}); \
 	done
 
 ## Install those items from etc/ that need to end up elsewhere.
@@ -656,7 +660,7 @@
 	      rm -f $$f; \
 	    done; \
 	  done;)
-	(cd $(DESTDIR)${man1dir}  && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
+	(cd $(DESTDIR)${man1dir}  && rm -f $(MAN_PAGES))
 	(cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(EMACS))