From 7eb21b49ef9e58fdfd7635cf7e0a6d295785203c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 4 Feb 2012 14:27:28 -0800 Subject: [PATCH] * Makefile.in (uninstall): Handle compressed info files and man pages. Fixes: debbugs:10718 --- ChangeLog | 5 +++++ Makefile.in | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfcfab4ee33..9712a2f0d0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-04 Glenn Morris + + * Makefile.in (uninstall): + Handle compressed info files and man pages. (Bug#10718) + 2012-02-02 Glenn Morris * configure.in [HAVE_NS]: diff --git a/Makefile.in b/Makefile.in index 6c1f34bade4..af0c902b381 100644 --- a/Makefile.in +++ b/Makefile.in @@ -727,11 +727,16 @@ uninstall: (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 -- 2.39.2