##
## nmh _does_ have a test suite!
##
-TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
- MH_TEST_DIR=@abs_builddir@/test/testdir \
- auxexecdir=$(auxexecdir) bindir=$(bindir) \
- mandir=$(mandir) sysconfdir=$(sysconfdir)
+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
##
-TESTS = test/bad-input/test-header \
+TESTS = test/ali/test-ali \
+ test/bad-input/test-header \
test/burst/test-burst \
test/comp/test-comp-format \
- test/folder/test-create \
- test/folder/test-total test/format/test-localmbox \
- test/format/test-myname test/format/test-myhost \
- test/format/test-mymbox \
+ test/folder/test-create test/folder/test-packf \
+ test/folder/test-sortm test/folder/test-total \
+ test/format/test-dp test/format/test-fmtdump \
+ test/format/test-localmbox test/format/test-myname \
+ test/format/test-myhost test/format/test-mymbox \
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/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 \
+ test/mhlist/test-mhlist test/mhmail/test-mhmail \
+ test/mhparam/test-mhparam test/mhpath/test-mhpath \
test/mhshow/test-cte-binary test/mhshow/test-qp \
test/mhshow/test-subpart test/mhstore/test-mhstore \
test/new/test-basic \
test/post/test-post-basic test/post/test-post-multiple \
test/post/test-post-dcc test/post/test-post-fcc \
test/post/test-post-multifrom test/post/test-post-envelope \
- test/post/test-post-group \
+ test/post/test-post-group test/post/test-mts \
+ test/prompter/test-prompter \
+ test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
test/refile/test-refile \
test/repl/test-if-str test/repl/test-trailing-newline \
- test/repl/test-multicomp \
- test/scan/test-scan \
+ test/repl/test-multicomp test/repl/test-repl \
+ 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 \
##
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
##
bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
uip/folder uip/forw uip/inc uip/install-mh uip/mark \
- uip/mhbuild uip/mhlist uip/mhmail uip/mhn uip/mhparam \
+ uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
uip/whom
-bin_SCRIPTS = etc/sendfiles
+bin_SCRIPTS = uip/mhmail etc/sendfiles
##
## This is all programs that get installed in the "lib" directory
##
## 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 \
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 \
## 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 \
man/rmf.man man/rmm.man man/scan.man man/send.man \
man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
man/unseen.man man/whatnow.man man/whom.man \
- test/README $(TESTS) test/inc/deb359167.mbox \
+ test/README test/fakesendmail $(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/mhmail/attachment.txt \
+ test/post/test-post-common.sh uip/mhmail \
SPECS/nmh.spec SPECS/build-nmh-cygwin
##
uip/md5.c
uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
-uip_mhmail_SOURCES = uip/mhmail.c
-
uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \
uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \
uip/termsbr.c uip/md5.c
$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@
##
+## Use configure to set up default LN, but through a make variable so
+## that it can be overridden at install time.
+##
+LN = @LN@
+
+##
## 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)
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
+ $(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)
if test x$(SETGID_MAIL) != x; then \
chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
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 \
##
manext1 = 1
manext5 = 5
+manext7 = 7
manext8 = 8
$(man_MANS): man/man.sed
@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' >> $@
.man.$(manext5):
@$(SED) -f man/man.sed $< > $@
+.man.$(manext7):
+ @$(SED) -f man/man.sed $< > $@
+
.man.$(manext8):
@$(SED) -f man/man.sed $< > $@
@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)