Moved conflict, rcv*, slocal, spost from libdir to bindir.

We should not hide them from the users.

diff --git a/man/conflict.man8 b/man/conflict.man8
index dc05548..ff2246c 100644 (file)
--- a/man/conflict.man8
+++ b/man/conflict.man8
@@ -7,7 +7,7 @@ conflict \- search for alias/password conflicts
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/conflict
+.B conflict

 .RB [ \-search
 .IR directory ]
 .RB [ \-mail
 .RB [ \-search
 .IR directory ]
 .RB [ \-mail

diff --git a/man/mh-chart.man1 b/man/mh-chart.man1
index d793989..805bea8 100644 (file)
--- a/man/mh-chart.man1
+++ b/man/mh-chart.man1
@@ -66,7 +66,7 @@ mh-chart \- Chart of nmh Commands
 .RB [ \-help ]
 
 .HP 5
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/conflict
+.B conflict

 .RB [ \-search
 .IR directory ]
 .RB [ \-mail
 .RB [ \-search
 .IR directory ]
 .RB [ \-mail

@@ -411,7 +411,7 @@ or
 .RB [ \-help ]
 
 .HP 5
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/spost
+.B spost

 .RB [ \-alias
 .IR aliasfile
 .RB " | " \-noalias ]
 .RB [ \-alias
 .IR aliasfile
 .RB " | " \-noalias ]

@@ -440,7 +440,7 @@ or
 .RB [ \-help ]
 
 .HP 5
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/rcvdist
+.B rcvdist

 .RB [ \-form
 .IR formfile ]
 [switches\ for
 .RB [ \-form
 .IR formfile ]
 [switches\ for

@@ -451,13 +451,13 @@ or
 .RB [ \-help ]
 
 .HP 5
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/rcvpack
+.B rcvpack

 .I file
 .RB [ \-version ]
 .RB [ \-help ]
 
 .HP 5
 .I file
 .RB [ \-version ]
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/rcvstore
+.B rcvstore

 .RI [ +folder ]
 .RB [ \-create " | " \-nocreate ]
 .RB [ \-unseen " | " \-nounseen ]
 .RI [ +folder ]
 .RB [ \-create " | " \-nocreate ]
 .RB [ \-unseen " | " \-nounseen ]

@@ -577,7 +577,7 @@ or
 .RB [ \-help ]
 
 .HP 5
 .RB [ \-help ]
 
 .HP 5

-.B %libdir%/slocal
+.B slocal

 [address\ info\ sender]
 .RB [ \-addr
 .IR address ]
 [address\ info\ sender]
 .RB [ \-addr
 .IR address ]

diff --git a/man/mh-profile.man5 b/man/mh-profile.man5
index b90cd97..5051da6 100644 (file)
--- a/man/mh-profile.man5
+++ b/man/mh-profile.man5
@@ -442,7 +442,7 @@ It is used to retrieve an external-body with access-type `mail-server'
 .RE
 .PP
 .BR mhlproc :
 .RE
 .PP
 .BR mhlproc :

-%libdir%/mhl
+%bindir%/mhl

 .RS 5
 This is the program used to filter messages in various ways.  It
 is used by
 .RS 5
 This is the program used to filter messages in various ways.  It
 is used by

@@ -473,7 +473,7 @@ to display message bodies (or message parts) of type text/plain.
 .RE
 .PP
 .BR postproc :
 .RE
 .PP
 .BR postproc :

-%libdir%/post
+%bindir%/post

 .RS 5
 This is the program used by
 .BR send ,
 .RS 5
 This is the program used by
 .BR send ,

@@ -514,7 +514,7 @@ to process and display non-text (MIME) messages.
 .RE
 .PP
 .BR showproc :
 .RE
 .PP
 .BR showproc :

-%libdir%/mhl
+%bindir%/mhl

 .RS 5
 This is the program used by
 .B show
 .RS 5
 This is the program used by
 .B show

diff --git a/man/mhmail.man1 b/man/mhmail.man1
index 33c237e..c6a3467 100644 (file)
--- a/man/mhmail.man1
+++ b/man/mhmail.man1
@@ -98,7 +98,7 @@ header correctly.
 .nf
 .ta \w'%etcdir%/ExtraBigFileName  'u
 ^%bindir%/inc~^Program to incorporate maildrop into folder
 .nf
 .ta \w'%etcdir%/ExtraBigFileName  'u
 ^%bindir%/inc~^Program to incorporate maildrop into folder

-^%libdir%/post~^Program to deliver a message
+^%bindir%/spost~^Program to deliver a message

 ^/tmp/mhmail*~^Temporary copy of message
 .fi
 
 ^/tmp/mhmail*~^Temporary copy of message
 .fi
 

diff --git a/man/post.man8 b/man/post.man8
index 14c3ae7..5bac6f7 100644 (file)
--- a/man/post.man8
+++ b/man/post.man8
@@ -7,7 +7,7 @@ post \- deliver a message
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/post
+.B post

 .RB [ \-alias
 .IR aliasfile ]
 .RB [ \-filter
 .RB [ \-alias
 .IR aliasfile ]
 .RB [ \-filter

@@ -187,8 +187,8 @@ entry in
 .nf
 .ta \w'%etcdir%/ExtraBigFileName  'u
 ^%etcdir%/mts.conf~^nmh mts configuration file
 .nf
 .ta \w'%etcdir%/ExtraBigFileName  'u
 ^%etcdir%/mts.conf~^nmh mts configuration file

-^%bindir%/refile~^Program to process Fcc:s
-^%libdir%/mhl~^Program to process Bcc:s
+^refile~^Program to process Fcc:s
+^mhl~^Program to process Bcc:s

 .fi
 
 .SH "PROFILE COMPONENTS"
 .fi
 
 .SH "PROFILE COMPONENTS"

@@ -199,6 +199,7 @@ consult the user's profile.
 
 .SH "SEE ALSO"
 mhmail(1), send(1), mh\-mail(5), mh\-alias(5), mh\-tailor(5),
 
 .SH "SEE ALSO"
 mhmail(1), send(1), mh\-mail(5), mh\-alias(5), mh\-tailor(5),

+refile(1), mhl(1),

 .I "Standard for the Format of ARPA Internet Text Messages"
 (RFC\-822)
 
 .I "Standard for the Format of ARPA Internet Text Messages"
 (RFC\-822)
 

diff --git a/man/rcvdist.man1 b/man/rcvdist.man1
index 66b4382..9edfc49 100644 (file)
--- a/man/rcvdist.man1
+++ b/man/rcvdist.man1
@@ -7,7 +7,7 @@ rcvdist \- asynchronously redistribute new mail
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/rcvdist
+.B rcvdist

 .RB [ \-form
 .IR formfile ]
 [switches\ for
 .RB [ \-form
 .IR formfile ]
 [switches\ for

diff --git a/man/rcvpack.man1 b/man/rcvpack.man1
index 9ca59a2..366b0d5 100644 (file)
--- a/man/rcvpack.man1
+++ b/man/rcvpack.man1
@@ -7,7 +7,7 @@ rcvpack \- append message to file
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/rcvpack
+.B rcvpack

 .I file
 .RB [ \-version ]
 .RB [ \-help ]
 .I file
 .RB [ \-version ]
 .RB [ \-help ]

diff --git a/man/rcvstore.man1 b/man/rcvstore.man1
index 571c2fd..1fff18f 100644 (file)
--- a/man/rcvstore.man1
+++ b/man/rcvstore.man1
@@ -7,7 +7,7 @@ rcvstore \- asynchronously incorporate mail into a folder
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/rcvstore
+.B rcvstore

 .RI [ +folder ]
 .RB [ \-create " | " \-nocreate ]
 .RB [ \-unseen " | " \-nounseen ]
 .RI [ +folder ]
 .RB [ \-create " | " \-nocreate ]
 .RB [ \-unseen " | " \-nounseen ]

diff --git a/man/slocal.man1 b/man/slocal.man1
index 6421714..c5cf7cf 100644 (file)
--- a/man/slocal.man1
+++ b/man/slocal.man1
@@ -7,7 +7,7 @@ slocal \- asynchronously filter and deliver new mail
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/slocal
+.B slocal

 [address\ info\ sender]
 .RB [ \-addr
 .IR address ]
 [address\ info\ sender]
 .RB [ \-addr
 .IR address ]

@@ -117,7 +117,7 @@ support a \&.forward file for directing incoming mail.
 You should include the line
 .PP
 .RS 5
 You should include the line
 .PP
 .RS 5

-\*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
+\*(lq|\ %bindir%/slocal\ \-user\ username\*(rq

 .RE
 .PP
 in your \&.forward file in your home directory.  This will cause
 .RE
 .PP
 in your \&.forward file in your home directory.  This will cause

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 7dcbb85..28b517f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -49,17 +49,17 @@ SETGID_MAIL    = @SETGID_MAIL@
        $(COMPILE) $<
 
 # commands to build
        $(COMPILE) $<
 
 # commands to build

-CMDS = ali anno burst comp dist flist folder forw mmh mark mhbuild mhl \
+CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
+       mhbuild mhl \

        mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
        mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \

-       print-mimetype prompter refile repl rmf rmm scan send sendfiles show \
-       sortm whatnow
+       print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
+       rmm scan send sendfiles show slocal sortm spost whatnow

 
 # commands that are links to other commands
 LCMDS = flists folders next prev
 
 # misc support binaries
 
 # commands that are links to other commands
 LCMDS = flists folders next prev
 
 # misc support binaries

-MISC = ap conflict dp fmtdump rcvdist rcvpack \
-       rcvstore slocal spost mhtest
+MISC = ap dp fmtdump mhtest

 
 # commands with 'S'pecial installation needs
 SCMDS = inc
 
 # commands with 'S'pecial installation needs
 SCMDS = inc

diff --git a/uip/slocal.c b/uip/slocal.c
index fe1977f..ae71c1b 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -9,7 +9,7 @@
 /*
 **  Under sendmail, users should add the line
 **
 /*
 **  Under sendmail, users should add the line
 **

-**      "| /usr/local/nmh/lib/slocal"
+**      "| /usr/local/mmh/bin/slocal"

 **
 **  to their $HOME/.forward file.
 **
 **
 **  to their $HOME/.forward file.
 **