Source tree and make process changes. make dist and make

maintainer-clean should now work as they are supposed to.

1 files changed, 36 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index a46f9d41..492462f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,13 +119,20 @@ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
 
-BUILT_SOURCES = mutt_dotlock.c
+EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO acconfig.h attach.h \
+	buffy.h charset.h config.h copy.h dotlock.h functions.h gen_defs \
+	globals.h hash.h history.h imap.h init.h keymap.h \
+	mailbox.h mapping.h mime.h mutt.h mutt_curses.h mutt_menu.h  \
+	mutt_regex.h mutt_socket.h mx.h pager.h parse.h pgp.h protos.h  \
+	reldate.h rfc1524.h rfc2047.h rfc822.h sha.h sha_locl.h sort.h mime.types
+
+BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
 
 CLEANFILES = mutt_dotlock.c
 
 LDADD = @LIBOBJS@ @INTLLIBS@
 
-SUBDIRS = doc intl po rx
+SUBDIRS = doc intl po rx contrib charsets
 
 OPS=$(srcdir)/OPS $(srcdir)/OPS.PGP
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -396,6 +403,7 @@ distdir: $(DISTFILES)
 	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
+	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
@@ -432,15 +440,17 @@ all-am: Makefile $(PROGRAMS) config.h
 
 install-exec-am: install-binPROGRAMS install-exec-local
 
+install-data-am: install-data-local
+
 uninstall-am: uninstall-binPROGRAMS
 
 install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive
+install-data: install-data-recursive install-data-am
 	@$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am
+install: install-recursive install-exec-am install-data-am
 	@:
 
 uninstall: uninstall-recursive uninstall-am
@@ -506,8 +516,8 @@ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
-install-exec-am uninstall-am install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
+install-exec-am install-data-am uninstall-am install-exec install-data \
+install uninstall all installdirs mostlyclean-generic distclean-generic \
 clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
@@ -531,6 +541,26 @@ install-exec-local:
 		chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
 	fi
 
+install-data-local:
+	-if [ ! -f $(sharedir)/Muttrc ]; then \
+		$(srcdir)/mkinstalldirs $(sharedir); \
+		$(INSTALL) -m 644 $(srcdir)/Muttrc $(sharedir); \
+	fi
+	-if [ ! -f $(sharedir)/mime.types ]; then \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(sharedir); \
+	fi
+
+# Don't make this one ChangeLog - it's intended to be
+# used manually.
+
+changelog:
+	rcs2log | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog
+	$(VISUAL) ChangeLog
+
+dist-hook:
+	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
+	-rm -f $(distdir)/config.h
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: