build: fix dist, distclean targets

'make dist' didn't install the 'lua' and 'hcache-bench' dirs.
'make distclean' deleted 'po/mutt.pot' and 'doc/neomutt-syntax.vim'

Fixes #566

diff --git a/Makefile.am b/Makefile.am
index 332e9815d48e7f6b32c2a13635e1936e19086824..ab0a24c502b215ad5ed8a20c4cab53e855ce8969 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,7 @@ conststrings.c: txt2c config.status
 
 CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
 
-DISTCLEANFILES= smime_keys txt2c po/$(PACKAGE).pot
+DISTCLEANFILES= smime_keys txt2c
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 63bda83b5ccd5645bac1f4db1c6a3c6783225bdb..754e9fe4fb0cee8999f91f92a345daf163184330 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -11,9 +11,11 @@ EXTRA_DIST = language.txt language50.txt  \
        iconv/README \
        iconv/make.sh \
        vim-keys \
-       keybase
+       keybase \
+       lua \
+       hcache-bench
 
-CONTRIB_DIRS = vim-keys keybase
+CONTRIB_DIRS = vim-keys keybase lua hcache-bench
 
 install-data-local:
        $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 41f2d88a7d82679c367eac8c1279ee745d0c3732..a87cf75648317e88d41af75363cf10f65e8de8b1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,9 +33,7 @@ EXTRA_DIST = dotlock.man              \
        makedoc.c makedoc_defs.h        \
        mutt.css mutt.xsl html.xsl chunk.xsl \
        $(BUILT_DISTFILES) neomutt-syntax.vim \
-       mutt-1.7.0-syntax.vim 
-
-
+       mutt-1.7.0-syntax.vim
 
 CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
        configuration.html mimesupport.html advancedusage.html \
@@ -149,7 +147,7 @@ sortcheck: manual.xml
 
 clean-local:
        rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1
-       rm -f *.aux *.log *.tex *.out neomutt-syntax.vim
+       rm -f *.aux *.log *.tex *.out
 
 DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
               instdoc Muttrc