X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c0d6a31061bba17b20e2d5a317f244fb63664eec..c4bbc2137e04f0be80fa008b97d65656e3e11ec5:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0e64a27b..a1e7bb09 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)" \
+		    supported_locks="$(supported_locks)" \
 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 		    ICONV_ENABLED=$(ICONV_ENABLED) \
 		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
@@ -54,14 +55,20 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/format/test-localmbox test/format/test-myname \
 	test/format/test-myhost test/format/test-mymbox \
 	test/format/test-rightjustify \
+	test/format/test-unquote \
 	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-msgchk \
 	test/inc/test-pop \
-	test/install-mh/test-install-mh test/manpages/test-manpages \
-	test/mhbuild/test-forw test/mhbuild/test-utf8-body \
+	test/install-mh/test-install-mh \
+	test/locking/test-datalocking test/locking/test-spoollocking \
+	test/manpages/test-manpages \
+	test/mhbuild/test-forw test/mhbuild/test-header-encode \
+	test/mhbuild/test-utf8-body \
+	test/mhfixmsg/test-mhfixmsg \
 	test/mhlist/test-mhlist test/mhmail/test-mhmail \
 	test/mhparam/test-mhparam test/mhpath/test-mhpath \
+	test/mhshow/test-charset \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
 	test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
 	test/mhstore/test-mhstore test/new/test-basic \
@@ -85,7 +92,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
+check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
 		 test/getcwidth
 DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
@@ -126,11 +133,11 @@ BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
 	       uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
-	       uip/mark 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
+	       uip/mark uip/mhbuild uip/mhfixmsg 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 = uip/mhmail etc/sendfiles
 
@@ -201,7 +208,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ##
 contribdir = $(docdir)/contrib
 dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
-		    docs/contrib/ml
+		    docs/contrib/ml docs/contrib/vpick
 
 ##
 ## Our man pages
@@ -212,9 +219,9 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
 	   man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-folders.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/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 man/mhfixmsg.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.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 \
@@ -233,10 +240,10 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
 	   man/mh-chart-gen.sh man/mh-draft.man man/mh-folders.man \
 	   man/mh-format.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/mhbuild.man man/mhfixmsg.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 \
@@ -264,170 +271,200 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
 ## overrides that are used to select different library options from the
 ## default.
 ##
+POSTLINK = @POSTLINK@
+
 uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
+uip_ali_LDADD = $(LDADD) $(POSTLINK)
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
+uip_anno_LDADD = $(LDADD) $(POSTLINK)
 
 uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
 		    uip/mhcachesbr.c uip/md5.c
+uip_burst_LDADD = $(LDADD) $(POSTLINK)
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c
-uip_comp_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_comp_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
-uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_flist_SOURCES = uip/flist.c
+uip_flist_LDADD = $(LDADD) $(POSTLINK)
 
 uip_folder_SOURCES = uip/folder.c
+uip_folder_LDADD = $(LDADD) $(POSTLINK)
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
-uip_forw_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_forw_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
 		  uip/popsbr.c
-uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
+uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(POSTLINK)
 
 uip_install_mh_SOURCES = uip/install-mh.c
+uip_install_mh_LDADD = $(LDADD) $(POSTLINK)
 
 uip_mark_SOURCES = uip/mark.c
+uip_mark_LDADD = $(LDADD) $(POSTLINK)
 
 uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
 		      uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c  \
 		      uip/mhfree.c uip/mhparse.c uip/termsbr.c uip/md5.c
-uip_mhbuild_LDADD = $(LDADD) $(TERMLIB)
+uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
+
+uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
+		       uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
+		       uip/mhshowsbr.c uip/mhlistsbr.c \
+		       uip/termsbr.c uip/md5.c
+uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB) $(POSTLINK)
 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/termsbr.c \
 		     uip/md5.c
-uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
+uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 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
-uip_mhn_LDADD = $(LDADD) $(TERMLIB)
+uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 uip_mhparam_SOURCES = uip/mhparam.c
+uip_mhparam_LDADD = $(LDADD) $(POSTLINK)
 
 uip_mhpath_SOURCES = uip/mhpath.c
+uip_mhpath_LDADD = $(LDADD) $(POSTLINK)
 
 uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \
 		     uip/mhfree.c uip/termsbr.c uip/md5.c
-uip_mhshow_LDADD = $(LDADD) $(TERMLIB)
+uip_mhshow_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 uip_mhstore_SOURCES = uip/mhstore.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
-uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
+uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
-uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
+uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
 		  uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c uip/termsbr.c
-uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_new_SOURCES = uip/new.c
+uip_new_LDADD = $(LDADD) $(POSTLINK)
 
 uip_packf_SOURCES = uip/packf.c uip/dropsbr.c
+uip_packf_LDADD = $(LDADD) $(POSTLINK)
 
 uip_pick_SOURCES = uip/pick.c uip/picksbr.c
-uip_pick_LDADD = $(LDADD) $(ICONVLIB)
+uip_pick_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)
 
 uip_prompter_SOURCES = uip/prompter.c
+uip_prompter_LDADD = $(LDADD) $(POSTLINK)
 
 uip_refile_SOURCES = uip/refile.c
+uip_refile_LDADD = $(LDADD) $(POSTLINK)
 
 uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \
 		   uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
-uip_repl_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_repl_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_rmf_SOURCES = uip/rmf.c
+uip_rmf_LDADD = $(LDADD) $(POSTLINK)
 
 uip_rmm_SOURCES = uip/rmm.c
+uip_rmm_LDADD = $(LDADD) $(POSTLINK)
 
 uip_scan_SOURCES = uip/scan.c uip/scansbr.c uip/termsbr.c
-uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_send_LDADD = $(LDADD) $(POSTLINK)
 
 uip_show_SOURCES = uip/show.c uip/mhlsbr.c uip/termsbr.c
-uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_sortm_SOURCES = uip/sortm.c
+uip_sortm_LDADD = $(LDADD) $(POSTLINK)
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
 		      uip/annosbr.c uip/distsbr.c
-uip_whatnow_LDADD = $(LDADD) $(READLINELIB)
+uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(POSTLINK)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
+uip_whom_LDADD = $(LDADD) $(POSTLINK)
 
 ##
 ## Programs definitions for all utilities that end up in $(libdir)
 ##
 
 uip_ap_SOURCES = uip/ap.c uip/termsbr.c
-uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_conflict_SOURCES = uip/conflict.c uip/aliasbr.c
+uip_conflict_LDADD = $(LDADD) $(POSTLINK)
 
 uip_dp_SOURCES = uip/dp.c uip/termsbr.c
-uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_fmtdump_SOURCES = uip/fmtdump.c
-uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB)
+uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)
 
 uip_fmttest_SOURCES = uip/fmttest.c uip/termsbr.c
-uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip/termsbr.c
-uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
 		     uip/termsbr.c uip/md5.c
-uip_mhtest_LDADD = $(LDADD) $(TERMLIB)
+uip_mhtest_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 uip_post_SOURCES = uip/post.c uip/aliasbr.c
-uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB)
+uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB) $(POSTLINK)
 
 uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c
-uip_rcvdist_LDADD = $(LDADD) $(ICONVLIB)
+uip_rcvdist_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)
 
 uip_rcvpack_SOURCES = uip/rcvpack.c uip/dropsbr.c
+uip_rcvpack_LDADD = $(LDADD) $(POSTLINK)
 
 uip_rcvstore_SOURCES = uip/rcvstore.c
+uip_rcvstore_LDADD = $(LDADD) $(POSTLINK)
 
 uip_rcvtty_SOURCES = uip/rcvtty.c uip/scansbr.c uip/termsbr.c
-uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
-uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS)
+uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK)
 
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
 		      uip/annosbr.c uip/distsbr.c
+uip_viamail_LDADD = $(LDADD) $(POSTLINK)
 
 test_getfullname_SOURCES = test/getfullname.c
-test_getfullname_LDADD = sbr/libmh.a
+test_getfullname_LDADD = $(LDADD) $(POSTLINK)
 
-test_getfqdn_SOURCES = test/getfqdn.c
-test_getfqdn_LDADD =
+test_getcanon_SOURCES = test/getcanon.c
+test_getcanon_LDADD = $(POSTLINK)
 
 test_fakepop_SOURCES = test/fakepop.c
-test_fakepop_LDADD =
+test_fakepop_LDADD = $(POSTLINK)
 
 test_fakesmtp_SOURCES = test/fakesmtp.c
-test_fakesmtp_LDADD =
+test_fakesmtp_LDADD = $(POSTLINK)
 
 test_getcwidth_SOURCES = test/getcwidth.c
-test_getcwidth_LDADD =
+test_getcwidth_LDADD = $(POSTLINK)
 
 etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c
-etc_gen_ctype_checked_LDADD =
+etc_gen_ctype_checked_LDADD = $(POSTLINK)
 
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
@@ -448,6 +485,8 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 	$(SED) -e 's,%mts%,$(MTS),' \
 	       -e 's,%mailspool%,$(mailspool),' \
 	       -e 's,%smtpservers%,$(smtpservers),' \
+	       -e 's,%default_locking%,$(default_locking),' \
+	       -e 's,%supported_locks%,$(supported_locks),' \
 				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
@@ -506,8 +545,9 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/context_find.c sbr/context_foil.c sbr/context_read.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/dtimep.l sbr/dtime.c \
+		      sbr/cpydgst.c sbr/crawl_folders.c sbr/credentials.c \
+		      sbr/discard.c sbr/done.c sbr/dtimep.l sbr/dtime.c \
+		      sbr/encode_rfc2047.c \
 		      sbr/escape_addresses.c \
 		      sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \
 		      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
@@ -532,11 +572,19 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/seq_print.c sbr/seq_read.c sbr/seq_save.c \
 		      sbr/seq_setcur.c sbr/seq_setprev.c sbr/seq_setunseen.c \
 		      sbr/showfile.c sbr/signals.c sbr/smatch.c \
-		      sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.c \
-		      sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
-		      sbr/fmt_def.c sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
-		      sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
-		      config/version.c
+		      sbr/snprintb.c sbr/ssequal.c \
+		      sbr/strindex.c sbr/trimcpy.c sbr/unquote.c \
+		      sbr/uprf.c sbr/vfgets.c \
+		      sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
+		      sbr/m_mktemp.c sbr/getansreadline.c sbr/vector.c \
+		      config/config.c config/version.c
+
+##
+## Because these files use the definitions in the libmh rule below,
+## they need to be rebuilt if the Makefile changes.
+##
+
+config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DMAILSPOOL='"$(mailspool)"' \
@@ -560,11 +608,14 @@ man/man.sed: Makefile
 	@echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
 	@echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
 	@echo 's,%bindir%,$(bindir),g' >> $@
+	@echo 's,%docdir%,$(docdir),g' >> $@
 	@echo 's,%etcdir%,$(sysconfdir),g' >> $@
 	@echo 's,%libdir%,$(libdir),g' >> $@
 	@echo 's,%mandir%,$(mandir),g' >> $@
 	@echo 's,%mailspool%,$(mailspool),g' >> $@
 	@echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
+	@echo 's,%default_locking%,$(default_locking),g' >> $@
+	@echo 's,%supported_locks%,$(supported_locks),g' >> $@
 	@echo 's,%manext1%,$(manext1),g' >> $@
 	@echo 's,%manext5%,$(manext5),g' >> $@
 	@echo 's,%manext7%,$(manext7),g' >> $@