X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=80d87f52c3bfaf14915773bd3c6933e23726bd74;hb=0a94d4c33a354667aada700e136beb235a9e0a90;hp=cf29544ea6f9e494b0e75d0f0a80c302133d35dd;hpb=911d7035bfc4229bdbb754dbc165982fc4d6c6d2;p=mmh

diff --git a/Makefile.am b/Makefile.am
index cf29544..80d87f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,6 +171,12 @@ dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
 		docs/TODO
 
 ##
+## Contribs that get installed in docdir/contrib/
+##
+contribdir = $(docdir)/contrib
+dist_contrib_DATA = docs/contrib/nmh.spec docs/contrib/replyfilter
+
+##
 ## Our man pages
 ##
 man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
@@ -194,7 +200,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 ## Automake using the automatic rules
 ##
 EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
-	     etc/mhn.defaults.sh $(MHNSEARCHPROG) nmh.spec DATE \
+	     etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
 	     docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
 	     man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
@@ -392,9 +398,8 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 	rm -f $@
 	$(SED) -e 's,%mts%,$(MTS),' \
 	       -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(sysconfdir),' \
 	       -e 's,%smtpservers%,$(smtpservers),' \
-	       			< $(srcdir)/etc/mts.conf.in > $@
+				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
@@ -492,7 +497,7 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
 
-mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c
+mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
 ##
 ## Our rules for generating man pages (both the rule for man.sed and
@@ -555,7 +560,7 @@ rpm: dist
 	@test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
 	@mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
 	@cp -p VERSION $(rpmdir)/SOURCES
-	@cp -p nmh.spec $(rpmdir)/SPECS
+	@cp -p docs/contrib/nmh.spec $(rpmdir)/SPECS
 	@rpmbuild --define '_topdir $(rpmdir)' \
 	  --define '_tmppath %{_topdir}/TMP' \
 	  --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \
@@ -582,7 +587,7 @@ gcov:
 	 fi
 	@echo rebuilding with AM_CFLAGS=--coverage . . .
 	@(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  && \
-          make check AM_CFLAGS=--coverage
+	  make check AM_CFLAGS=--coverage
 	@for i in `find . -name '*.gcda'`; do \
 	   gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
 	 done