From: Brendan Cully <brendan@kublai.com>
Date: Tue, 2 Aug 2005 03:46:06 +0000 (+0000)
Subject: Be more selective about what to remove during uninstall. (closes #1625)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809837b7dbd7fe3556171033646de9ddddada017;p=neomutt

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

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 2de203e11..9ce64abd5 100644
--- 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 bcc89adcd..dd81923c3 100644
--- 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