[Emacs-diffs] emacs ChangeLog Makefile.in

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/12/13 20:12:09

Modified files:
        .              : ChangeLog Makefile.in 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.792&r2=1.793
http://cvs.savannah.gnu.org/viewcvs/emacs/Makefile.in?cvsroot=emacs&r1=1.364&r2=1.365

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -b -r1.792 -r1.793
--- ChangeLog   13 Dec 2008 04:19:34 -0000      1.792
+++ ChangeLog   13 Dec 2008 20:12:08 -0000      1.793
@@ -1,6 +1,10 @@
 2008-12-13  Glenn Morris  <address@hidden>
 
        * 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  <address@hidden>
 

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- Makefile.in 13 Dec 2008 04:19:34 -0000      1.364
+++ Makefile.in 13 Dec 2008 20:12:09 -0000      1.365
@@ -125,10 +125,14 @@
 # data.         ${archlibdir} is a subdirectory of this.
 address@hidden@
 
-# 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).
 address@hidden@
-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))