From e82ff78678a198211bf868b118407349db38b4b1 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Mon, 18 Sep 2017 11:23:13 +0100
Subject: [PATCH] move mime.types to doc dir

Many distros have a package providing /etc/mime.types

We put our copy in:
    doc/neomutt/mime.types
---
 Makefile.am                  | 15 ++++-----------
 doc/Makefile.am              |  4 +++-
 mime.types => doc/mime.types |  0
 3 files changed, 7 insertions(+), 12 deletions(-)
 rename mime.types => doc/mime.types (100%)

diff --git a/Makefile.am b/Makefile.am
index 79f283bd9..0f4343caf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ EXTRA_DIST = account.h attach.h bcache.h browser.h buffy.h \
 	ChangeLog.md charset.h CODE_OF_CONDUCT.md compress.h copy.h \
 	COPYRIGHT filter.h functions.h globals.h \
 	group.h history.h init.h keymap.h LICENSE.md mailbox.h \
-	mbyte.h mime.h mime.types mutt.h mutt_commands.h \
+	mbyte.h mime.h mutt.h mutt_commands.h \
 	mutt_curses.h mutt_idna.h mutt_lua.h mutt_menu.h mutt_notmuch.h \
 	mutt_options.h mutt_regex.h mutt_sasl.h mutt_sasl_plain.h \
 	mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h myvar.h nntp.h opcodes.h pager.h \
@@ -101,7 +101,7 @@ pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
 txt2c_SOURCES = txt2c.c
 txt2c_LDADD =
 
-noinst_PROGRAMS = txt2c $(SMIMEAUX_TARGET) $(PGPAUX_TARGET)
+noinst_PROGRAMS = txt2c $(PGPAUX_TARGET)
 
 conststrings.c: txt2c config.status
 	( \
@@ -136,10 +136,6 @@ git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
-	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
-	fi
 	-if test -n "$(SMIMEAUX_TARGET)"; then \
 		$(MKDIR_P) $(DESTDIR)$(libdir)/$(PACKAGE); \
 		for i in $(SMIMEAUX_TARGET); do \
@@ -154,11 +150,8 @@ install-data-local:
 	fi
 
 uninstall-local:
-	for i in mime.types; do \
-		if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \
-			rm $(DESTDIR)$(sysconfdir)/$$i; \
-		fi; \
-		rm $(DESTDIR)$(sysconfdir)/$${i}.dist; \
+	for i in smime_keys $(PGPAUX_TARGET); do \
+		rm -fr $(DESTDIR)$(libdir)/$(PACKAGE)/$$i; \
 	done
 
 distclean-local:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ca0c79a49..0e65fb65f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = $(BUILT_DISTFILES) chunk.xsl gen-map-doc html.xsl makedoc.c \
 	makedoc_defs.h manual.xml.head manual.xml.tail mbox.5 mmdf.5 \
 	neomutt.css neomutt.man neomutt.xsl neomuttrc neomuttrc.head \
 	neomuttrc.man.head neomuttrc.man.tail neomutt-syntax.vim PGP-Notes.txt \
-	smime-notes.txt pgpewrap.1 pgpring.1 smime_keys.1
+	smime-notes.txt pgpewrap.1 pgpring.1 smime_keys.1 mime.types
 
 CHUNKED_DOCFILES = advancedusage.html configuration.html gettingstarted.html \
 	intro.html mimesupport.html miscellany.html optionalfeatures.html \
@@ -67,6 +67,7 @@ install-data-local: makedoc-all
 		$(INSTALL) -m 644 neomuttrc $(DESTDIR)$(sysconfdir); \
 	fi
 	-$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
+	-$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(docdir)/mime.types
 
 uninstall-local:
 	for f in neomutt.1 smime_keys_$(PACKAGE).1 pgpewrap_$(PACKAGE).1 pgpring_$(PACKAGE).1; do \
@@ -86,6 +87,7 @@ uninstall-local:
 		rm $(DESTDIR)$(sysconfdir)/$${i}.dist; \
 	done
 	rm -f $(DESTDIR)$(docdir)/neomutt-syntax.vim
+	rm -f $(DESTDIR)$(docdir)/mime.types
 
 check:
 manual.txt: manual.html
diff --git a/mime.types b/doc/mime.types
similarity index 100%
rename from mime.types
rename to doc/mime.types
-- 
2.40.0