X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=5e91c8a8f77572bd0fc08a0d1f9c9200ade7c65f;hb=1a02dc347cf3d583b8b2e4a57e9ff32cf82240e9;hp=265bef625786445818f0abd745fba90b4af30253;hpb=aa520b835b4f260ecd8da6ed8fe2d5dfa845c44e;p=mmh diff --git a/Makefile.am b/Makefile.am index 265bef6..5e91c8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,9 @@ auxexecdir = @libdir@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \ MH_TEST_DIR=@abs_builddir@/test/testdir \ auxexecdir=$(auxexecdir) bindir=$(bindir) \ - mandir=$(mandir) sysconfdir=$(sysconfdir) + mandir=$(mandir) sysconfdir=$(sysconfdir) \ + MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \ + $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT. ## ## Important note: the "cleanup" test should always be last ## @@ -65,7 +67,7 @@ TESTS = test/bad-input/test-header \ test/refile/test-refile \ test/repl/test-if-str test/repl/test-trailing-newline \ test/repl/test-multicomp \ - test/scan/test-scan \ + test/scan/test-scan test/scan/test-scan-multibyte \ test/sequences/test-flist test/sequences/test-mark \ test/whatnow/test-attach-detach test/whatnow/test-cd \ test/whatnow/test-ls test/whom/test-whom \ @@ -73,6 +75,7 @@ TESTS = test/bad-input/test-header \ check_SCRIPTS = test/common.sh check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp +DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 ## ## Stuff that should be cleaned via "make clean" @@ -80,7 +83,7 @@ check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \ etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) clean-local: - @rm -rf RPM a.out.DSYM uip/a.out.DSYM + @rm -rf RPM a.out.dSYM uip/a.out.dSYM @rm -rf test/testdir ## @@ -93,7 +96,7 @@ MAINTAINERCLEANFILES = cscope.files cscope.out ## SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \ config.h.in config.h.in~ config.sub configure depcomp \ - install-sh missing ylwrap nmh-*.tar.gz + install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig superclean: maintainer-clean @rm -f $(SUPERCLEANFILES) .PHONY: superclean @@ -163,7 +166,8 @@ sysconf_DATA = etc/mhn.defaults etc/mts.conf ## ## Documentation that gets installed in docdir ## -dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \ +dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ + docs/COMPLETION-BASH docs/COMPLETION-TCSH \ docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \ docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \ docs/README-HOOKS docs/README-components docs/README.about \ @@ -174,7 +178,7 @@ dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \ ## Contribs that get installed in docdir/contrib/ ## contribdir = $(docdir)/contrib -dist_contrib_DATA = docs/contrib/nmh.spec docs/contrib/replyfilter +dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh ## ## Our man pages @@ -183,12 +187,12 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \ man/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.1 \ man/fmtdump.8 man/fnext.1 man/folder.1 man/folders.1 \ man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \ - man/mh-alias.5 man/mh-chart.1 man/mh-draft.5 man/mh-format.5 \ - man/mh-mail.5 man/mh-profile.5 man/mh-sequence.5 \ + man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-format.5 \ + man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 man/mh-sequence.5 \ man/mh-tailor.5 man/mhbuild.1 man/mhl.1 man/mhlist.1 \ man/mhmail.1 man/mhn.1 man/mhparam.1 man/mhpath.1 \ man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \ - man/mts.conf.5 man/new.1 man/next.1 man/nmh.1 man/packf.1 \ + man/mts.conf.5 man/new.1 man/next.1 man/nmh.7 man/packf.1 \ man/pick.1 man/post.8 man/prev.1 man/prompter.1 man/rcvdist.1 \ man/rcvpack.1 man/rcvstore.1 man/rcvtty.1 man/refile.1 \ man/repl.1 man/rmf.1 man/rmm.1 man/scan.1 man/send.1 \ @@ -200,7 +204,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) DATE \ + etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE MACHINES \ 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 \ @@ -209,11 +213,11 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ man/folders.man man/forw.man man/fprev.man man/inc.man \ man/install-mh.man man/mark.man man/mh-alias.man \ man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \ - man/mh-mail.man man/mh-profile.man man/mh-sequence.man \ - man/mh-tailor.man man/mhbuild.man man/mhl.man man/mhlist.man \ - man/mhmail.man man/mhn.man man/mhparam.man man/mhpath.man \ - man/mhshow.man man/mhstore.man man/msgchk.man man/msh.man \ - man/mts.conf.man man/new.man man/next.man man/nmh.man \ + man/mh-mail.man man/mh-profile.man man/mh_profile.man \ + man/mh-sequence.man man/mh-tailor.man man/mhbuild.man man/mhl.man \ + man/mhlist.man man/mhmail.man man/mhn.man man/mhparam.man \ + man/mhpath.man man/mhshow.man man/mhstore.man man/msgchk.man \ + man/msh.man man/mts.conf.man man/new.man man/next.man man/nmh.man \ man/packf.man man/pick.man man/post.man man/prev.man \ man/prompter.man man/rcvdist.man man/rcvpack.man \ man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \ @@ -222,7 +226,8 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ man/unseen.man man/whatnow.man man/whom.man \ test/README $(TESTS) test/inc/deb359167.mbox \ test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \ - test/inc/md5sums test/post/test-post-common.sh + test/inc/md5sums test/post/test-post-common.sh \ + SPECS/nmh.spec SPECS/build-nmh-cygwin ## ## These are all of the definitions for each of the programs listed above. @@ -421,21 +426,18 @@ install-exec-hook: rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT) rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT) rm -f $(DESTDIR)$(bindir)/next$(EXEEXT) - ln $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT) - ln $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT) - ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT) - ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT) - ln $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT) - ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT) - ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT) + @LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT) if test x$(SETGID_MAIL) != x; then \ - chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT); \ + chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \ chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \ fi -install-data-hook: - rm -f $(DESTDIR)$(man5dir)/mh_profile.5 - ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5 ## ## Make sure we remove those links at uninstall time ## @@ -447,7 +449,6 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT) rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT) rm -f $(DESTDIR)$(bindir)/next$(EXEEXT) - rm -f $(DESTDIR)$(man5dir)/mh_profile.5 ## ## Our rules to build our internal libraries (libmh.a, libmts.a) @@ -459,7 +460,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \ sbr/context_replace.c sbr/context_save.c \ sbr/copy.c sbr/copyip.c sbr/cpydata.c \ sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \ - sbr/done.c sbr/dtime.c sbr/escape_display_name.c \ + sbr/done.c sbr/dtime.c sbr/escape_addresses.c \ sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \ sbr/folder_addmsg.c sbr/folder_delmsgs.c \ sbr/folder_free.c sbr/folder_pack.c \ @@ -507,6 +508,7 @@ mts_libmts_a_SOURCES = mts/smtp/smtp.c ## manext1 = 1 manext5 = 5 +manext7 = 7 manext8 = 8 $(man_MANS): man/man.sed @@ -525,6 +527,7 @@ man/man.sed: Makefile @echo 's,%default_pager%,$(pagerpath),g' >> $@ @echo 's,%manext1%,$(manext1),g' >> $@ @echo 's,%manext5%,$(manext5),g' >> $@ + @echo 's,%manext7%,$(manext7),g' >> $@ @echo 's,%manext8%,$(manext8),g' >> $@ @echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@ @echo ' s,%mhl_forward%,,g' >> $@ @@ -542,6 +545,9 @@ man/mh-chart.man: .man.$(manext5): @$(SED) -f man/man.sed $< > $@ +.man.$(manext7): + @$(SED) -f man/man.sed $< > $@ + .man.$(manext8): @$(SED) -f man/man.sed $< > $@ @@ -559,14 +565,12 @@ ChangeLog: ## rpm: dist @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES - @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES @cp -p VERSION $(rpmdir)/SOURCES - @cp -p docs/contrib/nmh.spec $(rpmdir)/SPECS @rpmbuild --define '_topdir $(rpmdir)' \ --define '_tmppath %{_topdir}/TMP' \ --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \ - -ba $(rpmdir)/SPECS/nmh.spec + -ba SPECS/nmh.spec .PHONY: rpm ## @@ -594,7 +598,7 @@ gcov: gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done @for i in `find . -name '*.gcno'`; do \ - if ! test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then \ + if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \ echo untested: $$i; \ fi; \ done @@ -617,7 +621,7 @@ upload: dist @echo "Did you run 'make distcheck' already?" @if test -z "$(SKIP_GPG_SIG)"; then \ echo "Creating GPG signature (set SKIP_GPG_SIG to bypass this step)"; \ - gpg --output $(DIST_ARCHIVES).sig --detatch-sig $(DIST_ARCHIVES); \ + gpg --output $(DIST_ARCHIVES).sig --detach-sig $(DIST_ARCHIVES); \ fi @echo "Setting permissions for savannah.gnu.org" chmod 664 $(DIST_ARCHIVES)