[Emacs-diffs] /srv/bzr/emacs/trunk r107104: * Makefile.in (uninstall): Handle compressed info files and man pages.

[Glenn Morris]

------------------------------------------------------------
revno: 107104
fixes bug(s): http://debbugs.gnu.org/10718
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-04 14:27:28 -0800
message:
  * Makefile.in (uninstall): Handle compressed info files and man pages.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-02-02 02:12:57 +0000
+++ b/ChangeLog 2012-02-04 22:27:28 +0000
@@ -1,3 +1,8 @@
+2012-02-04  Glenn Morris  <address@hidden>
+
+       * Makefile.in (uninstall):
+       Handle compressed info files and man pages.  (Bug#10718)
+
 2012-02-02  Glenn Morris  <address@hidden>
 
        * configure.in [HAVE_NS]:

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-02-01 06:04:34 +0000
+++ b/Makefile.in       2012-02-04 22:27:28 +0000
@@ -727,11 +727,16 @@
        (cd $(DESTDIR)${infodir} && \
          for elt in $(INFO_FILES); do \
            $(INSTALL_INFO) --remove --info-dir=. $$elt; \
-           for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+           if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+              ext=.gz; else ext=; fi; \
+           for f in `ls $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext 
2>/dev/null`; do \
              rm -f $$f; \
            done; \
          done;)
-       (cd $(DESTDIR)${man1dir}  && rm -f $(MAN_PAGES))
+       (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+           ext=.gz; else ext=; fi; \
+        cd $(DESTDIR)${man1dir} && for page in ${MAN_PAGES}; do \
+          rm -f $$page$$ext; done )
        (cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(EMACS))
        (cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png 
hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg 
hicolor/scalable/mimetypes/emacs-document.svg )
        -rm -f $(DESTDIR)${desktopdir}/emacs.desktop