X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=5e91c8a8f77572bd0fc08a0d1f9c9200ade7c65f;hb=1a02dc347cf3d583b8b2e4a57e9ff32cf82240e9;hp=8a384a7e37c6c7f111109ff88aa97aaf17daaba9;hpb=6a83547f2f35bc049dbcb552d6f3bc9979980817;p=mmh diff --git a/Makefile.am b/Makefile.am index 8a384a7..5e91c8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,6 +37,7 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \ MH_TEST_DIR=@abs_builddir@/test/testdir \ auxexecdir=$(auxexecdir) bindir=$(bindir) \ 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 @@ -66,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 \ @@ -95,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 @@ -165,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 \ @@ -185,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-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 \ @@ -415,10 +417,6 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile ## ## This rule gets called at "make install" time; we use it to create links ## between different programs. -## On Cygwin, the choice of ln or ln -s must be made at install time, -## not configure time, because some filesystems (NTFS) support hard -## links but others (FAT32) don't. The fallback to cp -p might not be -## needed, but it's here just in case. ## install-exec-hook: rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT) @@ -428,29 +426,13 @@ install-exec-hook: rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT) rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT) rm -f $(DESTDIR)$(bindir)/next$(EXEEXT) - cd $(DESTDIR)$(bindir) && \ - if ln flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \ - ln folder$(EXEEXT) folders$(EXEEXT) && \ - ln new$(EXEEXT) fnext$(EXEEXT) && \ - ln new$(EXEEXT) fprev$(EXEEXT) && \ - ln new$(EXEEXT) unseen$(EXEEXT) && \ - ln show$(EXEEXT) prev$(EXEEXT) && \ - ln show$(EXEEXT) next$(EXEEXT); then :; \ - elif ln -s flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \ - ln -s folder$(EXEEXT) folders$(EXEEXT) && \ - ln -s new$(EXEEXT) fnext$(EXEEXT) && \ - ln -s new$(EXEEXT) fprev$(EXEEXT) && \ - ln -s new$(EXEEXT) unseen$(EXEEXT) && \ - ln -s show$(EXEEXT) prev$(EXEEXT) && \ - ln -s show$(EXEEXT) next$(EXEEXT); then :; \ - else cp -p flist$(EXEEXT) flists$(EXEEXT) && \ - cp -p folder$(EXEEXT) folders$(EXEEXT) && \ - cp -p new$(EXEEXT) fnext$(EXEEXT) && \ - cp -p new$(EXEEXT) fprev$(EXEEXT) && \ - cp -p new$(EXEEXT) unseen$(EXEEXT) && \ - cp -p show$(EXEEXT) prev$(EXEEXT) && \ - cp -p show$(EXEEXT) next$(EXEEXT); \ - fi + @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) && \ chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \ @@ -478,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 \ @@ -526,6 +508,7 @@ mts_libmts_a_SOURCES = mts/smtp/smtp.c ## manext1 = 1 manext5 = 5 +manext7 = 7 manext8 = 8 $(man_MANS): man/man.sed @@ -544,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' >> $@ @@ -561,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 $< > $@ @@ -634,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)