X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=d64fa3cd79b942839c78043c6219cb81dfaca151;hb=603d80d3a5fb399830d589406a5f55f280b0bcb5;hp=adf3f890198e6080f85be414c29209cfa5d77879;hpb=305a4cd7666fe9e2922b9d6541ef3ff2420c2168;p=mmh diff --git a/Makefile.am b/Makefile.am index adf3f89..d64fa3c 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 \ @@ -81,7 +83,7 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 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 ## @@ -164,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 \ @@ -184,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 \ @@ -201,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 \ @@ -224,7 +227,7 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \ 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 \ - SPECS/nmh.spec + SPECS/nmh.spec SPECS/build-nmh-cygwin ## ## These are all of the definitions for each of the programs listed above. @@ -414,6 +417,10 @@ 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) @@ -423,13 +430,29 @@ 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) + 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 if test x$(SETGID_MAIL) != x; then \ chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \ chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \ @@ -457,7 +480,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 \ @@ -505,6 +528,7 @@ mts_libmts_a_SOURCES = mts/smtp/smtp.c ## manext1 = 1 manext5 = 5 +manext7 = 7 manext8 = 8 $(man_MANS): man/man.sed @@ -523,6 +547,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' >> $@ @@ -540,6 +565,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 $< > $@