Merge changes made in Gnus trunk.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 965fdd9..5466193 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,7 @@ libexecdir=@libexecdir@
 # (and they contain cross-references that expect them to be there).
 mandir=@mandir@
 man1dir=$(mandir)/man1
-MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
+MAN_PAGES=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
@@ -243,6 +243,8 @@ INSTALL_STRIP =
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
+# If non-nil, gzip the installed Info and man pages.
+GZIP_INFO = @GZIP_INFO@
 
 # ============================= Targets ==============================
 
@@ -580,6 +582,10 @@ install-arch-indep: mkdir info install-etc
              for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
                ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
                chmod a+r $(DESTDIR)${infodir}/$$f; \
+               if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+                 rm -f $(DESTDIR)${infodir}/$$f.gz; \
+                 ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
+               else true; fi; \
              done; \
           done); \
        else true; fi
@@ -599,7 +605,11 @@ install-arch-indep: mkdir info install-etc
        for page in ${MAN_PAGES}; do \
          (cd $${thisdir}; \
           ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
-          chmod a+r $(DESTDIR)${man1dir}/$${page}); \
+          chmod a+r $(DESTDIR)${man1dir}/$${page}; \
+          if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+            rm -f $(DESTDIR)${man1dir}/$${page}.gz; \
+            ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \
+          else true; fi ); \
        done
 
 ## Install those items from etc/ that need to end up elsewhere.