(manext): Remove variable.

(MAN_PAGES): New variable.
(install-arch-indep, uninstall): Use MAN_PAGES for list of files to add
and remove.

2 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ab728055538..79d5ce402a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/Makefile.in b/Makefile.in
index 08dfc041948..18f27616e9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,10 +125,14 @@ sharedstatedir=@sharedstatedir@
 # 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 @@ install-arch-indep: mkdir info install-etc
         -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 @@ uninstall:
               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))