$NetBSD: patch-ag,v 1.1.1.1 2001/04/27 14:06:06 wiz Exp $

--- deliver.8.orig	Wed Dec  1 20:54:02 1999
+++ deliver.8	Sat Jan 29 16:42:59 2000
@@ -98,15 +98,15 @@
 .TP
 .BI \-s " system delivery file"
 Specify an alternate system delivery file.  The default is
-.I /usr/local/lib/deliver.sys.
+.I @DELIVER_CONF_PREFIX@sys.
 .TP
 .BI \-p " post-user delivery file"
 Specify an alternate post-user delivery file.  The default is
-.I /usr/local/lib/deliver.post.
+.I @DELIVER_CONF_PREFIX@post.
 .TP
 .BI \-e " error delivery file"
 Specify an alternate error delivery file.  The default is
-.I /usr/local/lib/deliver.err.
+.I @DELIVER_CONF_PREFIX@err.
 .TP
 .BI \-u " user delivery file"
 Specify an alternate user delivery file.  The default is
@@ -229,7 +229,7 @@
 .TP
 .I "system delivery file"
 The system delivery file, if it exists, is created by the postmaster.
-By default, it is named ``/usr/local/lib/deliver.sys''.  It controls
+By default, it is named ``@DELIVER_CONF_PREFIX@sys''.  It controls
 the delivery of all messages on the system where it is installed.  It
 is executed with arguments of the name(s) specified on the
 .I Deliver
@@ -245,7 +245,7 @@
 .TP
 .I "post-user delivery file"
 The post-user delivery file, if it exists, is created by the
-postmaster.  By default, it is named ``/usr/local/lib/deliver.post''.
+postmaster.  By default, it is named ``@DELIVER_CONF_PREFIX@post''.
 It is executed after the system and user delivery files, but before
 any attempt at message delivery.  Its arguments are those addresses
 which are about to receive the message, whether those addresses
@@ -258,7 +258,7 @@
 .TP
 .I "error delivery file"
 The error delivery file, if it exists, is created by the postmaster.
-By default, it is named ``/usr/local/lib/deliver.err''.  After
+By default, it is named ``@DELIVER_CONF_PREFIX@err''.  After
 .I Deliver
 has attempted delivery to all requested destinations, and if delivery
 to one or more of those destinations failed,
@@ -467,9 +467,9 @@
 .SH LOGGING
 .I Deliver
 records its activity in two files: the ``delivery log'', named
-.IR /usr/adm/deliver.log,
+.IR /var/log/deliver.log,
 and the ``error log'', named
-.IR /usr/adm/deliver.errlog.
+.IR /var/log/deliver.errlog.
 .PP
 The deliver log is a record of activity of each
 .I Deliver
@@ -534,17 +534,17 @@
 Neither, one or both of ML_DOTLOCK and ML_DOTMLK may be specified.
 None or one of ML_LOCKF, ML_FCNTL or ML_LOCKING may be specified.
 .SH FILES
-/usr/local/lib/deliver.sys      system delivery file
+@DELIVER_CONF_PREFIX@sys        system delivery file
 .br
-/usr/local/lib/deliver.post     post-user delivery file
+@DELIVER_CONF_PREFIX@post       post-user delivery file
 .br
-/usr/local/lib/deliver.err      error delivery file
+@DELIVER_CONF_PREFIX@err        error delivery file
 .br
 ~user/.deliver                  user delivery file(s)
 .br
-/usr/adm/deliver.log            delivery log
+/var/log/deliver.log            delivery log
 .br
-/usr/adm/deliver.errlog         error log
+/var/log/deliver.errlog         error log
 .br
 /etc/systemid                   system name (Xenix only)
 .SH SUPPORT