This commit was generated by cvs2svn to compensate for changes in r42575,

which included commits to RCS files with non-trunk default branches.

2 files changed, 16 insertions, 4 deletions

diff --git a/contrib/sendmail/makemap/Makefile.m4 b/contrib/sendmail/makemap/Makefile.m4
index 0f0c242..983ffdf 100644
--- a/contrib/sendmail/makemap/Makefile.m4
+++ b/contrib/sendmail/makemap/Makefile.m4
@@ -1,7 +1,7 @@
 #
 #  This Makefile is designed to work on the old "make" program.
 #
-#	@(#)Makefile.m4	8.20	(Berkeley)	6/4/98
+#	@(#)Makefile.m4	8.21	(Berkeley)	7/12/1998
 #
 
 # C compiler
@@ -41,7 +41,7 @@ LIBDIRS=confLIBDIRS
 LIBS=	ifdef(`confLIBS', `confLIBS')
 
 # location of makemap binary (usually /usr/sbin or /usr/etc)
-BINDIR=	${DESTDIR}ifdef(`confSBINDIR', `confSBINDIR', `/usr/sbin')
+SBINDIR=${DESTDIR}ifdef(`confSBINDIR', `confSBINDIR', `/usr/sbin')
 
 # additional .o files needed
 OBJADD=	ifdef(`confOBJADD', `confOBJADD')
@@ -95,7 +95,7 @@ makemap.${MAN8SRC}: makemap.8
 install: install-makemap install-docs
 
 install-makemap: makemap
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} makemap ${BINDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} makemap ${SBINDIR}
 
 install-docs: makemap.${MAN8SRC}
 ifdef(`confNO_MAN_INSTALL', `dnl',
diff --git a/contrib/sendmail/makemap/makemap.8 b/contrib/sendmail/makemap/makemap.8
index 6180c8b..81f53a8 100644
--- a/contrib/sendmail/makemap/makemap.8
+++ b/contrib/sendmail/makemap/makemap.8
@@ -7,7 +7,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     @(#)makemap.8	8.10 (Berkeley) 5/19/98
+.\"     @(#)makemap.8	8.12 (Berkeley) 11/13/1998
 .\"
 .Dd November 16, 1992
 .Dt MAKEMAP 8
@@ -18,8 +18,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl N
+.if \nP .Op Fl c Ar cachesize
 .Op Fl d
 .Op Fl f
+.if \nP .Op Fl l
 .Op Fl o
 .Op Fl r
 .Op Fl s
@@ -76,6 +78,11 @@ Include the null byte that terminates strings
 in the map.
 This must match the \-N flag in the sendmail.cf
 ``K'' line.
+.if \nP \
+\{\
+.It Fl c
+Use the specified hash and B-Tree cache size.
+.\}
 .It Fl d
 Allow duplicate keys in the map.
 This is only allowed on B-Tree format maps.
@@ -90,6 +97,11 @@ This is intended to mesh with the
 \fBK\fP
 line in sendmail.cf.
 The value is never case folded.
+.if \nP \
+\{\
+.It Fl l
+List supported map types.
+.\}
 .It Fl o
 Append to an old file.
 This allows you to augment an existing file.