--- ./man/Makefile.in	Thu Jan 27 12:14:58 2000
+++ ../nmh-1.0.4/./man/Makefile.in	Wed Jan 31 01:54:35 2001
@@ -110,6 +110,8 @@
 man.sed: Makefile
 	echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
 	echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
+	echo 's,%etcdir%/tmac.h,$(SRC)/$(SRCDIR)/man/tmac.h,g' >> $@
+	echo 's,.so %etcdir%/,.so $(SRC)/$(SRCDIR)/etc/,g' >> $@
 	echo 's,%bindir%,$(bindir),g' >> $@
 	echo 's,%etcdir%,$(etcdir),g' >> $@
 	echo 's,%libdir%,$(libdir),g' >> $@
--- ./mts/smtp/Makefile.in	Tue Oct 26 22:21:12 1999
+++ ../nmh-1.0.4/./mts/smtp/Makefile.in	Tue Jan 30 08:17:33 2001
@@ -59,7 +59,7 @@
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
 	  $(LIBTOOL) -static -c $(OBJS) -o $@  ; \
 	else \
-	  ar cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  $(AR) cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
 	  $(RANLIB) $@  ; \
 	fi 
 
--- ./mts/sendmail/Makefile.in	Tue Oct 26 22:21:12 1999
+++ ../nmh-1.0.4/./mts/sendmail/Makefile.in	Tue Jan 30 08:17:33 2001
@@ -56,7 +56,7 @@
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
 	  $(LIBTOOL) -static -c $(OBJS) -o $@  ; \
 	else \
-	  ar cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  $(AR) cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
 	  $(RANLIB) $@  ; \
 	fi 
 
--- ./sbr/Makefile.in	Tue Oct 26 22:21:12 1999
+++ ../nmh-1.0.4/./sbr/Makefile.in	Tue Jan 30 08:17:33 2001
@@ -97,7 +97,7 @@
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
 	  $(LIBTOOL) -static -c -o libmh.a $(OBJS) ; \
 	else \
-	  ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  $(AR) cr libmh.a `$(LORDER) $(OBJS) | $(TSORT)`  ; \
 	  $(RANLIB) libmh.a  ; \
  	fi 
 
--- ./config.h.in	Fri Mar 17 12:19:43 2000
+++ ../nmh-1.0.4/./config.h.in	Tue Jan 30 08:18:18 2001
@@ -23,8 +23,8 @@
  * other programs which may modify your maildrops.
  * Currently you can only use one type.
  */
-#define DOT_LOCKING   1
-/* #define FCNTL_LOCKING 1 */
+/* #define DOT_LOCKING   1 */
+#define FCNTL_LOCKING 1
 /* #define LOCKF_LOCKING 1 */
 /* #define FLOCK_LOCKING 1 */
 
@@ -107,7 +107,7 @@
  * to be able to use both POP3 _and_ Kerberized POP and plan to use inc and
  * msgchk's -kpop switch every time in the latter case.
  */
-#define POPSERVICE "pop3"
+#define POPSERVICE "pop-3"
 
 /*
  * Define the default creation modes for folders and messages.
--- ./zotnet/Makefile.in	Tue Oct 26 22:21:12 1999
+++ ../nmh-1.0.4/./zotnet/Makefile.in	Tue Jan 30 08:17:33 2001
@@ -47,7 +47,7 @@
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
 	  $(LIBTOOL) -static -c $(OBJS) -o $@  ; \
 	else \
-	  ar cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  $(AR) cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
 	  $(RANLIB) $@  ; \
 	fi