X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=80d87f52c3bfaf14915773bd3c6933e23726bd74;hb=4c9ad9f4f44521d7eae9ea1e8277cf7f8b577d20;hp=057e37a93a09e75060b65302a6e9757b1be73068;hpb=28183a4aa1c5615f943285df6301ed5f84bc6138;p=mmh diff --git a/Makefile.am b/Makefile.am index 057e37a..80d87f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ TESTS = test/bad-input/test-header \ test/forw/test-forw-digest \ test/forw/test-forw-format \ test/inc/test-deb359167 test/inc/test-eom-align \ - test/inc/test-inc-scanout \ + test/inc/test-inc-scanout test/install-mh/test-install-mh \ test/manpages/test-manpages test/mhbuild/test-forw \ test/mhlist/test-mhlist test/mhparam/test-mhparam \ test/mhpath/test-mhpath \ @@ -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)" \ @@ -581,7 +586,8 @@ gcov: echo For best results with gcov, configure without --enable-debug; \ fi @echo rebuilding with AM_CFLAGS=--coverage . . . - @(make clean && make AM_CFLAGS=--coverage) > /dev/null && make check + @(make clean && make AM_CFLAGS=--coverage) > /dev/null && \ + make check AM_CFLAGS=--coverage @for i in `find . -name '*.gcda'`; do \ gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done