Be more selective about what to remove during uninstall. (closes #1625)

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 2de203e119dcded2dd07f4d6c1e7a5251087a3a6..9ce64abd519e75969b9f50f42c85160876d72f45 100644 (file)
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -47,9 +47,13 @@ install:
                $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv   ;     \
        done
 
-# Nothing needs to be done - uninstall in doc removes samples as well.
-# This is just so make uninstall doesn't fail.
 uninstall:
+       for f in $(SAMPLES) ; do \
+               rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
+       done
+       -rm -rf $(DESTDIR)$(docdir)/samples/iconv
+       -rmdir $(DESTDIR)$(docdir)/samples
+       -rmdir $(DESTDIR)$(docdir)
 
 maintainer-clean: distclean
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bcc89adcde478a386d55c6e1e5ac3dbfaade919e..dd81923c34dcbcafc03f86817faaef47db7df14e 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -84,12 +84,12 @@ install: all instdoc
        ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
        ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-       for f in $(srcdir_DOCFILES) ; do \
-               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-       done
        for f in $(topsrcdir_DOCFILES) ; do \
                $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
        done
+       for f in $(srcdir_DOCFILES) ; do \
+               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+       done
        $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
        for file in manual*.html ; do   \
@@ -97,10 +97,20 @@ install: all instdoc
        done
 
 uninstall:
-       -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-       -rm -f $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
-       -rm -f $(DESTDIR)$(mandir)/man5/muttrc.5
-       -rm -rf $(DESTDIR)$(docdir)
+       for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
+               rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
+       done
+       for f in muttrc.5 mbox.5 mmdf.5 ; do \
+               rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
+       done
+       for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) ; do \
+               rm -f $(DESTDIR)$(docdir)/$$f ; \
+       done
+       -rm -f $(DESTDIR)$(docdir)/manual.txt
+       for f in manual*.html ; do \
+               rm -f $(DESTDIR)$(docdir)/html/$$f ; \
+       done
+       -rmdir $(DESTDIR)$(docdir)/html
 
 check:
 manual.txt: manual.sgml