--bindir=DIR (DEFAULT is ${prefix}/bin)
nmh's binaries (show, inc, comp, ...) are installed here.
---libdir=DIR (DEFAULT is ${prefix}/lib)
- nmh's support binaries (post, slocal, mhl, ...) are installed here.
+--libexecdir=DIR (DEFAULT is ${prefix}/libexec)
+ nmh's support binaries (post, slocal, mhl, ...) are installed
+ in ${libexecdir}/nmh.
--sysconfdir=DIR (DEFAULT is ${prefix}/etc)
- nmh's config files (mts.conf, mhn.defaults, ...) are installed here.
+ nmh's config files (mts.conf, mhn.defaults, ...) are installed
+ in ${sysconfdir}/nmh.
--mandir=DIR (DEFAULT is ${prefix}/man)
nmh's man pages are installed here.
MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
##
-## Automake doesn't let us install programs in $(libdir), so we create our
-## own directory prefix to use in the primary variable.
+## Install config files and back-end programs in our own subdirecctories.
##
-auxexecdir = @libdir@
+nmhetcdir = @sysconfdir@/nmh
+nmhlibexecdir = @libexecdir@/nmh
##
## nmh _does_ have a test suite!
##
TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
MH_TEST_DIR="@abs_builddir@/test/testdir" \
- auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
- mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
+ nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
+ mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
supported_locks="$(supported_locks)" \
default_locking="${default_locking}" \
MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
bin_SCRIPTS = uip/mhmail etc/sendfiles
##
-## This is all programs that get installed in the "lib" directory
+## This is all programs that get installed in the "libexec/nmh" directory
##
-auxexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \
+nmhlibexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \
uip/post uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty \
uip/slocal uip/viamail
-auxexec_SCRIPTS = uip/spost
+nmhlibexec_SCRIPTS = uip/spost
##
## Programs that MAY need to get built at some point; we need to list them
##
## Extra files we need to install in various places
##
-dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
+dist_nmhetc_DATA = etc/MailAliases etc/components etc/digestcomps \
etc/distcomps etc/forwcomps etc/mhl.body etc/mhl.digest \
etc/mhl.format etc/mhl.forward etc/mhl.headers \
etc/mhl.reply etc/mhshow.marker etc/rcvdistcomps \
## The same as above, but we don't include these in the distribution
## (because they're generated at compile time)
##
-sysconf_DATA = etc/mhn.defaults etc/mts.conf
+nmhetc_DATA = etc/mhn.defaults etc/mts.conf
##
## Documentation that gets installed in docdir
uip_whom_LDADD = $(LDADD) $(POSTLINK)
##
-## Programs definitions for all utilities that end up in $(libdir)
+## Programs definitions for all utilities that end up in $(nmhlibexecdir)
##
uip_ap_SOURCES = uip/ap.c
config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
-sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
+sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(nmhetcdir)"' \
-DMAILSPOOL='"$(mailspool)"' \
-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
- -DNMHLIBDIR='"$(libdir)"'
+ -DNMHLIBEXECDIR='"$(nmhlibexecdir)"'
mts_libmts_a_SOURCES = mts/smtp/smtp.c
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,%nmhetcdir%,$(nmhetcdir),g' >> $@
+ @echo 's,%nmhlibexecdir%,$(nmhlibexecdir),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' >> $@
#define nmhbindir(file) NMHBINDIR#file
#define nmhetcdir(file) NMHETCDIR#file
-#define nmhlibdir(file) NMHLIBDIR#file
+#define nmhlibexecdir(file) NMHLIBEXECDIR#file
/*
/* profile entry for external url access command */
char *nmhaccessurl = "nmh-access-url";
-char *mhlibdir = NMHLIBDIR;
+char *mhlibexecdir = NMHLIBEXECDIR;
char *mhetcdir = NMHETCDIR;
/*
* for "Bcc:" recipients.
*/
-char *mhlproc = nmhlibdir (/mhl);
+char *mhlproc = nmhlibexecdir (/mhl);
/*
* This is the super handy BBoard reading program, which is
* deliver mail to users. This is the interface to the MTS.
*/
-char *postproc = nmhlibdir (/post);
+char *postproc = nmhlibexecdir (/post);
/*
* This is program is called by slocal to handle
* the action `folder' or `+'.
*/
-char *rcvstoreproc = nmhlibdir (/rcvstore);
+char *rcvstoreproc = nmhlibexecdir (/rcvstore);
/*
* This program is called to remove a message by rmm or refile -nolink.
* that such message not be filtered in any way.
*/
-char *showproc = nmhlibdir (/mhl);
+char *showproc = nmhlibexecdir (/mhl);
/*
* This program is called by vmh as the back-end to the window management
[smtpservers="localhost"])
AC_SUBST([smtpservers])dnl
-dnl ----------------------------------------------------
-dnl Default location is /usr/local/nmh/{bin,etc,lib,man}
-dnl ----------------------------------------------------
+dnl -------------------------------------------------------------------
+dnl Default location is /usr/local/nmh/{bin,etc,libexec,man}, unless we
+dnl find an existing installation, in which case we use its location.
+dnl -------------------------------------------------------------------
AC_PREFIX_DEFAULT([/usr/local/nmh])
+AC_PREFIX_PROGRAM([mhparam])
dnl ------------------
dnl CHECK THE COMPILER
dnl docs for the rationale for bindir etc being unexpanded).
eval "nmhbin=${bindir}"; eval "nmhbin=${nmhbin}"
eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
-eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}"
+eval "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
eval "nmhman=${mandir}"; eval "nmhman=${nmhman}"
eval "nmhrpm=${nmhrpm}";
preprocessor flags : ${CPPFLAGS}
source code location : ${srcdir}
binary install path : ${nmhbin}
-library install path : ${nmhlib}
-config files install path : ${nmhsysconf}
+libexec install path : ${nmhlibexec}/nmh
+config files install path : ${nmhsysconf}/nmh
man page install path : ${nmhman}
RPM build root : ${nmhrpm}
backup prefix : ${backup_prefix}
- An "rtrim" flag has been added to mhl to remove any trailing
whitespace from filtered text lines. A corresponding "nortrim" flag
has also been added.
+- The default locations for configuration files and suppoooort binaries
+ have been changed. Configuration files now install into ${sysconfdir}/nmh,
+ and support binaries are placed in ${libexecdir}/nmh. If you are upgrading
+ an existing installation you should look for old configuration files in
+ ${sysconfdir} and merge any local customizations into the new files in
+ ${sysconfdir}/nmh, then remove the old files. ${libdir} will also contain
+ obsolete support programs that should be removed.
+- When building from source, configure will derive ${prefix} from an existing
+ nmh installation if it finds one in your $PATH.
-----------------
OBSOLETE FEATURES
- Support for the MHPDEBUG environment variable is deprecated and will be
removed from a future nmh release. Instead, use the -debug switch to pick.
+- With the move of support binaries from ${libdir} to ${libexecdir}/nmh, the
+ mostly undocumented 'libdir' mhparam(1) component has been replaced by a
+ new 'libexecdir' component. 'libdir' will be removed in a future release.
---------
BUG FIXES
bindir=`finddir $0`
nmhbindir=`cd "$bindir" && pwd`
-nmhlibdir=`$nmhbindir/mhparam libdir`
+nmhlibexecdir=`$nmhbindir/mhparam libexecdir`
#### Process switches.
-s|-su|-sub|-subj|-subje|-subjec|-subject) subjectarg=1 ;;
-t|-to) toarg=1 ;;
-v|-ve|-ver|-vers|-versi|-versio|-version)
- "$nmhlibdir/viamail" -version | sed 's/viamail/sendfiles/'; exit ;;
+ "$nmhlibexecdir/viamail" -version | sed 's/viamail/sendfiles/'; exit ;;
-*) die ;;
*) if [ $compressarg -eq 1 ]; then
compress="$arg"
if [ x"$from" = x ]; then
if [ x"$PERSON" = x ]; then
- from=`"$nmhlibdir/ap" -format '%(localmbox)' 0`
+ from=`"$nmhlibexecdir/ap" -format '%(localmbox)' 0`
else
from="$PERSON"
fi
#### Send using viamail.
tar cvf - "$@" | $compress | \
- "$nmhlibdir/viamail" -to "$to" -subject "$subject" \
+ "$nmhlibexecdir/viamail" -to "$to" -subject "$subject" \
-from "$from" -parameters "type=tar$conversion" \
-comment "extract with $uncompress | tar xvpf -" \
-delay "$delay" -verbose
usernames, then files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.TP 20
.PD 0
.TP 20
aliasfile
-%etcdir%/MailAliases
+%nmhetcdir%/MailAliases
.TP
\-nolist
.TP
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/ap
+.B %nmhlibexecdir%/ap
.RB [ \-form
.IR formatfile ]
.RB [ \-format
$HOME/\&.mh\(ruprofile
The user's profile.
.TP
-%etcdir%/mts.conf
+%nmhetcdir%/mts.conf
The mts configuration file.
.PD
.SH "PROFILE COMPONENTS"
.SH FILES
.PD 0
.TP 20
-%etcdir%/components
+%nmhetcdir%/components
The standard message skeleton.
.TP
<mh\-dir>/components
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/distcomps~^The standard message skeleton
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/distcomps~^The standard message skeleton
^or <mh\-dir>/distcomps~^Rather than the standard skeleton
^$HOME/\&.mh\(ruprofile~^The user profile
^<mh\-dir>/draft~^The draft file
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/dp
+.B %nmhlibexecdir%/dp
.RB [ \-form
.IR formatfile ]
.RB [ \-format
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/fmtdump
+.B %nmhlibexecdir%/fmtdump
.RB [ \-form
.IR formatfile ]
.RB [ \-format
$HOME/.mh_profile
The user's profile.
.TP
-%etcdir%/scan.default
+%nmhetcdir%/scan.default
The default format file.
.PD
.SH "PROFILE COMPONENTS"
done on usernames, and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.SS MODE SELECTION AND COMPONENT SPECIFICATION
.B Fmttest
and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.PD 0
.TP 25
-%etcdir%/forwcomps
+%nmhetcdir%/forwcomps
The standard message skeleton.
.TP
<mh\-dir>/forwcomps
Rather than the standard skeleton.
.TP
-%etcdir%/digestcomps
+%nmhetcdir%/digestcomps
The message skeleton if
.B \-digest
is given.
<mh\-dir>/digestcomps
Rather than the standard skeleton.
.TP
-^%etcdir%/mhl.forward
+^%nmhetcdir%/mhl.forward
The standard message filter.
.TP
<mh\-dir>/mhl.forward
$HOME/.mh_profile
The user's profile.
.TP
-%etcdir%/mts.conf
+%nmhetcdir%/mts.conf
mts configuration file.
.TP
%mailspool%/$USER
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/install\-mh
+.B %nmhlibexecdir%/install\-mh
.RB [ \-auto ]
.RB [ \-check ]
.RB [ \-version ]
.IR \&.mh\(ruprofile ,
.B install\-mh
will check for the existence of a global profile
-.IR %etcdir%/mh.profile .
+.IR %nmhetcdir%/mh.profile .
If found, this will be used to initialize the new
.IR \&.mh\(ruprofile .
.PP
$HOME/.mh_profile
The user's profile.
.TP
-%etcdir%/mh.profile
+%nmhetcdir%/mh.profile
Used to initialize user's profile.
.PD
.SH "PROFILE COMPONENTS"
.PP
.RS 5
.nf
-<%etcdir%/BBoardAliases
+<%nmhetcdir%/BBoardAliases
fred: frated@UCI.example
sgroup: fred, fear, freida
b-people: Blind List: bill, betty
.PP
The first line says that more aliases should immediately be read from
the file
-.BR %etcdir%/BBoardAliases .
+.BR %nmhetcdir%/BBoardAliases .
Following this, \*(lqfred\*(rq
is defined as an alias for \*(lqfrated@UCI.example\*(rq, and \*(lqsgroup\*(rq
is defined as an alias for the three names \*(lqfrated@UCI.example\*(rq,
Default alias file.
.SH FILES
.TP 20
-%etcdir%/MailAliases
+%nmhetcdir%/MailAliases
System-wide default alias file.
.SH "SEE ALSO"
.IR ali (1),
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^%mailspool%/$USER~^Location of mail drop
.fi
.SH "SEE ALSO"
format, see the examples provided with the
.B nmh
distribution (found in the
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
directory) and
.IR mh\-format (5)
for details on how to make sure your MIME headers are properly
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/mkstemp
+.B %nmhlibexecdir%/mkstemp
.RB [ \-directory
.IR directory ]
.RB [ \-prefix
.RE
.PP
.BR mhlproc :
-%libdir%/mhl
+%nmhlibexecdir%/mhl
.RS 5
This is the program used to filter messages in various ways. It
is used by
.RE
.PP
.BR postproc :
-%libdir%/post
+%nmhlibexecdir%/post
.RS 5
This is the program used by
.BR send ,
.RE
.PP
.BR showproc :
-%libdir%/mhl
+%nmhlibexecdir%/mhl
.RS 5
This is the program used by
.B show
After consulting .mh_profile,
some programs read an optional profile specified by a
program-specific environment variable,
-and then the system-wide profile %etcdir%/mhn.defaults.
+and then the system-wide profile %nmhetcdir%/mhn.defaults.
These programs are mhbuild, mhshow, mhstore, and mhn.
mhfixmsg is similar, but has no optional profile.
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^or $MH~^Rather than the standard profile
^<mh\-dir>/context~^The user context
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^<mh\-dir>/context~^The user context
^<folder>/\&.mh\(rusequences~^File for public sequences
mh-tailor, mts.conf \- mail transport configuration for nmh message handler
.SH DESCRIPTION
The file
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
defines run-time options for those
.B nmh
programs which interact (in some form) with the message transport system.
.RE
.PP
.BR maildelivery :
-%libdir%/maildelivery
+%nmhlibexecdir%/maildelivery
.RS 5
The name of the system-wide default
.I maildelivery
.\" .RE
.\" .PP
.\" .BR popbblist :
-.\" %etcdir%/hosts.popbb
+.\" %nmhetcdir%/hosts.popbb
.\" .RS 5
.\" A file containing of lists of hosts that are allowed to use the POP
.\" facility to access BBoards using the guest account. If this file is not
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mts.conf~^nmh mts configuration file
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
.fi
.SH "PROFILE COMPONENTS"
None
will attempt to consult
.PP
.RS 5
-%etcdir%/mhn.defaults
+%nmhetcdir%/mhn.defaults
.RE
.PP
if it exists.
is done on usernames, and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^$MHBUILD~^Additional profile entries
-^%etcdir%/mhn.defaults~^System default MIME profile entries
+^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
.fi
.SH "PROFILE COMPONENTS"
.fc ^ ~
.B nmh
is installed, it searches for a conversion program for text/html
content, and if one is found, inserts a mhfixmsg-format-text/html
-entry in %etcdir%/mhn.defaults. An entry of the same name in the
+entry in %nmhetcdir%/mhn.defaults. An entry of the same name in the
user's profile takes precedence. The user can add entries for
other text subtypes to their profile.
.PP
.RS 5
mhfixmsg -outfile - | \\
.RS 0
-%libdir%/rcvstore +folder
+%nmhlibexecdir%/rcvstore +folder
.RE
.RE
.SS Summary of Applicability
#### The Backups directory is relative to MAILDIR.
MKSTEMP = 'mkstemp -directory Backups -prefix mhfixmsg'
MHFIXMSG = 'mhfixmsg -noverbose -file - -outfile -'
-STORE = %libdir%/rcvstore
+STORE = %nmhlibexecdir%/rcvstore
:0 w: nmh-workers/procmail.$LOCKEXT
* ^TOnmh-workers@nongnu.org
searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.fc ^ ~
.nf
-.ta \w'%etcdir%/mhn.defaults 'u
+.ta \w'%nmhetcdir%/mhn.defaults 'u
^$HOME/\&.mh\(ruprofile~^The user profile
-^%etcdir%/mhn.defaults~^Default mhfixmsg conversion entries
+^%nmhetcdir%/mhn.defaults~^Default mhfixmsg conversion entries
.fi
.SH "PROFILE COMPONENTS"
.fc ^ ~
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/mhl
+.B %nmhlibexecdir%/mhl
.RB [ \-bell " | " \-nobell ]
.RB [ \-clear " | " \-noclear ]
.RB [ \-folder
will first search for this file in the user's
.B nmh
directory, and will then search in the directory
-.IR %etcdir% .
+.IR %nmhetcdir% .
This default
can be changed by using the
.B \-form
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mhl.format~^The message template
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mhl.format~^The message template
^or <mh\-dir>/mhl.format~^Rather than the standard template
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^%bindir%/inc~^Program to incorporate maildrop into folder
-^%libdir%/post~^Program to deliver a message
+^%nmhlibexecdir%/post~^Program to deliver a message
^/tmp/mhmail*~^Temporary copy of message
.fi
.SH "SEE ALSO"
is specified, then all components in the nmh profile are
displayed and other arguments are ignored.
.PP
-.BR mhparam
+.B mhparam
can provide other information, such as the
.B nmh
version identifier, the locations of the nmh
.I etcdir
and
-.I libdir
+.I libexecdir
install directories, all
.I proc
settings, and the
switch displays all such other information available from
.BR mhparam .
.PP
+Note that the internal
+.B libdir
+component has been replaced by
+.BR libexecdir .
+The old form is deprecated and will be removed in a future release.
+.PP
Examples:
.PP
.RS 5
Mail
% mhparam mhlproc
-%libdir%/mhl
+%nmhlibexecdir%/mhl
% mhparam \-component Path
Path: Mail
%nmhversion%
% mhparam etcdir
-%etcdir%
+%nmhetcdir%
-% mhparam libdir
-%libdir%
+% mhparam libexecdir
+%nmhlibexecdir%
% mhparam spoollocking
%default_locking%
will attempt to consult
.PP
.RS 5
-%etcdir%/mhn.defaults
+%nmhetcdir%/mhn.defaults
.RE
.PP
which is created automatically during
usernames, and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^$MHSHOW~^Additional profile entries
-^%etcdir%/mhn.defaults~^System default MIME profile entries
-^%etcdir%/mhl.headers~^The headers template
-^%etcdir%/mhshow.marker~^Example content marker
+^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
+^%nmhetcdir%/mhl.headers~^The headers template
+^%nmhetcdir%/mhshow.marker~^Example content marker
.fi
.SH "PROFILE COMPONENTS"
.fc ^ ~
will attempt to consult
.PP
.RS 5
-%etcdir%/mhn.defaults
+%nmhetcdir%/mhn.defaults
.RE
.PP
which is created automatically during
and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^$MHSTORE~^Additional profile entries
-^%etcdir%/mhn.defaults~^System default MIME profile entries
+^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
.fi
.SH "PROFILE COMPONENTS"
.fc ^ ~
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
-^%etcdir%/mts.conf~^nmh mts configuration file
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
^%mailspool%/$USER~^Location of mail drop
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.B nmh
commands
.TP
-%etcdir%
+%nmhetcdir%
contains
.B nmh
format files
.TP
-%libdir%
+%nmhlibexecdir%
contains
.B nmh
library commands
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^\&.msgbox\&.map~^A binary index of the file
.fi
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/post
+.B %nmhlibexecdir%/post
.RB [ \-alias
.IR aliasfile ]
.RB [ \-filter
Not all mail transport systems support this feature.
.PP
The mail transport system default is provided in
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
but can be overriiden here with the
.B \-mts
switch.
switches can be used to override the default mail server (defined by the
.RI servers
entry in
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
).
.PP
If
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mts.conf~^nmh mts configuration file
-^%etcdir%/MailAliases~^global nmh alias file
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
+^%nmhetcdir%/MailAliases~^global nmh alias file
^%bindir%/refile~^Program to process Fcc:s
-^%libdir%/mhl~^Program to process Bcc:s
+^%nmhlibexecdir%/mhl~^Program to process Bcc:s
.fi
.SH "PROFILE COMPONENTS"
.B post
(RFC 822)
.SH DEFAULTS
.nf
-.RB ` \-alias "' defaults to %etcdir%/MailAliases"
+.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases"
.RB ` \-format '
.RB ` \-nomime '
.RB ` \-nomsgid '
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^/tmp/prompter*~^Temporary copy of message
.fi
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/rcvdist
+.B %nmhlibexecdir%/rcvdist
.RB [ \-form
.IR formfile ]
[switches\ for
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/rcvdistcomps~^Default message skeleton
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/rcvdistcomps~^Default message skeleton
^or <mh\-dir>/rcvdistcomps~^Rather than standard message skeleton
-^%etcdir%/mts.conf~^nmh mts configuration file
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
^$HOME/\&.maildelivery~^The file controlling local delivery
-^%etcdir%/maildelivery~^Rather than the standard file
+^%nmhetcdir%/maildelivery~^Rather than the standard file
.fi
.SH "SEE ALSO"
.IR rcvpack (1),
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/rcvpack
+.B %nmhlibexecdir%/rcvpack
.I file
.RB [ \-mbox ]
.RB [ \-mmdf ]
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mts.conf~^nmh mts configuration file
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
.fi
.SH "SEE ALSO"
.IR rcvdist (1),
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/rcvstore
+.B %nmhlibexecdir%/rcvstore
.RI [ +folder ]
.RB [ \-create " | " \-nocreate ]
.RB [ \-unseen " | " \-nounseen ]
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/rcvtty
+.B %nmhlibexecdir%/rcvtty
.RI [ command ]
.RB [ \-form
.IR formatfile ]
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mts.conf~^nmh mts configuration file
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
^$HOME/\&.maildelivery~^The file controlling local delivery
-^%etcdir%/maildelivery~^Rather than the standard file
+^%nmhetcdir%/maildelivery~^Rather than the standard file
.fi
.SH CONTEXT
None
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
usernames, and files are searched for in the user's
.I Mail
directory as specified in their profile. If not found there, the directory
-.RI \*(lq %etcdir% \*(rq
+.RI \*(lq %nmhetcdir% \*(rq
is checked.
.PP
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/replcomps~^The standard reply template
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/replcomps~^The standard reply template
^or <mh\-dir>/replcomps~^Rather than the standard template
-^%etcdir%/replgroupcomps~^The standard `reply -group' template
+^%nmhetcdir%/replgroupcomps~^The standard `reply -group' template
^or <mh\-dir>/replgroupcomps~^Rather than the standard template
-^%etcdir%/mhl.reply~^The standard message filter
+^%nmhetcdir%/mhl.reply~^The standard message filter
^or <mh\-dir>/mhl.reply~^Rather than the standard filter
^$HOME/\&.mh\(ruprofile~^The user profile
^<mh\-dir>/draft~^The draft file
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
An example of a
.I rmmproc
script that saves a message based in its Message-ID is provided in
-%etcdir%/rmmproc.messageid. To enable it, simply add a
+%nmhetcdir%/rmmproc.messageid. To enable it, simply add a
.I rmmproc
component that names it to your profile.
.PP
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
to have dates in them.
.PP
The
-.B %etcdir%
+.B %nmhetcdir%
directory contains several format files as examples of customized
.B scan
output.
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
as to how long it should make header lines containing addresses.
.PP
The mail transport system default is provided in
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
but can be overriiden here with the
.B \-mts
switch.
and the
.B \-port
switches can be used to override the default mail server (defined by the
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
.RI servers
entry). The
.B \-snoop
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH DEFAULTS
.nf
.RB ` file "' defaults to <mh\-dir>/draft"
-.RB ` \-alias "' defaults to %etcdir%/MailAliases"
+.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases"
.RB ` \-nodraftfolder '
.RB ` \-nofilter '
.RB ` \-format '
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH SYNOPSIS
.HP 5
.na
-.B %libdir%/slocal
+.B %nmhlibexecdir%/slocal
.RB [ \-addr
.IR address ]
.RB [ \-info
You should include the line
.PP
.ce
-\*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
+\*(lq|\ %nmhlibexecdir%/slocal\ \-user\ username\*(rq
.PP
in your \&.forward file in your home directory. This will cause
your MTA to invoke
perform an action which delivers the message, then
.B slocal
will check for a global delivery file at
-.IR %etcdir%/maildelivery .
+.IR %nmhetcdir%/maildelivery .
This file is read according to the same rules. This file must be
owned by root and must be writable only by root.
.PP
default \- file ? mailbox
# always run rcvtty
-* \- pipe R %libdir%/rcvtty
+* \- pipe R %nmhlibexecdir%/rcvtty
.fi
.SS "Sub-process environment"
When a process is invoked, its environment is: the user/group-ids are
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
-^%etcdir%/mts.conf~^nmh mts configuration file
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file
^$HOME/\&.maildelivery~^The file controlling local delivery
-^%etcdir%/maildelivery~^Rather than the standard file
+^%nmhetcdir%/maildelivery~^Rather than the standard file
^%mailspool%/$USER~^The default maildrop
.fi
.SH "SEE ALSO"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
^<mh\-dir>/draft~^The draft file
.fi
man page for more information.
.PP
The mail transport system default is provided in
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
but can be overriiden here with the
.B \-mts
switch.
and the
.B \-port
switches can be used to override the default mail server (defined by the
-.I %etcdir%/mts.conf
+.I %nmhetcdir%/mts.conf
.RI servers
entry). The
.B \-snoop
.SH FILES
.fc ^ ~
.nf
-.ta \w'%etcdir%/ExtraBigFileName 'u
+.ta \w'%nmhetcdir%/ExtraBigFileName 'u
^$HOME/\&.mh\(ruprofile~^The user profile
.fi
.SH "PROFILE COMPONENTS"
.nf
.RB ` file "' defaults to <mh\-dir>/draft"
.RB ` \-nocheck '
-.RB ` \-alias "' defaults to %etcdir%/MailAliases"
+.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases"
.fi
.SH CONTEXT
None
test -z "$prefix" && prefix=@prefix@
test -z "$datarootdir" && datarootdir=@datarootdir@
test -z "$exec_prefix" && exec_prefix=@exec_prefix@
-test -z "$auxexecdir" && auxexecdir="@libdir@"
+test -z "$nmhexecdir" && nmhexecdir="@libexecdir@/nmh"
test -z "$bindir" && bindir="@bindir@"
test -z "$mandir" && mandir="@mandir@"
-test -z "$sysconfdir" && sysconfdir="@sysconfdir@"
+test -z "$nmhetcdir" && nmhetcdir="@sysconfdir@/nmh"
test -z "$supported_locks" && supported_locks="@supported_locks@"
test -z "$default_locking" && default_locking="@default_locking@"
test -z "$MULTIBYTE_ENABLED" && MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
test -z "$ICONV_ENABLED" && ICONV_ENABLED="@ICONV_ENABLED@"
-export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
+export MH_TEST_DIR nmhexecdir bindir mandir nmhetcdir
export MULTIBYTE_ENABLED ICONV_ENABLED
test -z "$MH_INST_DIR" && MH_INST_DIR="${MH_TEST_DIR}/inst"
setup_test ()
{
MH="${MH_TEST_DIR}/Mail/.mh_profile"
- MHMTSCONF="${MH_INST_DIR}${sysconfdir}/mts.conf"
- MH_LIB_DIR="${MH_INST_DIR}${auxexecdir}"
- export MH MHMTSCONF MH_LIB_DIR
+ MHMTSCONF="${MH_INST_DIR}${nmhetcdir}/mts.conf"
+ MH_LIBEXEC_DIR="${MH_INST_DIR}${nmhexecdir}"
+ export MH MHMTSCONF MH_LIBEXEC_DIR
#
# Only install once
Path: ${MH_TEST_DIR}/Mail
buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild
fileproc: ${MH_INST_DIR}${bindir}/refile
-libdir: ${MH_LIB_DIR}
+libexecdir: ${MH_LIBEXEC_DIR}
mhbuild: -nocontentid
-mhlproc: ${MH_LIB_DIR}/mhl
+mhlproc: ${MH_LIBEXEC_DIR}/mhl
moreproc: cat
-postproc: ${MH_LIB_DIR}/post
-showproc: ${MH_LIB_DIR}/mhl
+postproc: ${MH_LIBEXEC_DIR}/post
+showproc: ${MH_LIBEXEC_DIR}/mhl
EOF
for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
scan.YYYYMMDD scan.curses scan.default scan.highlighted scan.mailx \
scan.nomime scan.size scan.time scan.timely scan.unseen
do
- cp "${MH_INST_DIR}${sysconfdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
+ cp "${MH_INST_DIR}${nmhetcdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
done
folder -create +inbox > /dev/null
expected_err=$MH_TEST_DIR/$$.expected_err
actual=$MH_TEST_DIR/$$.actual
actual_err=$MH_TEST_DIR/$$.actual_err
-localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0 | sed 's/^<\(.*\)>$/\1/'`
+localmbox=`${MH_LIBEXEC_DIR}/ap -format "%(localmbox)" 0 | sed 's/^<\(.*\)>$/\1/'`
#### Use sendmail/pipe below to override default mts.
mts_fakesendmail="${MHMTSCONF}-fakesendmail"
fi
#### Puts message on stdin in a drop that the test knows about.
-deliver="$MH_LIB_DIR/rcvpack $MH_TEST_DIR/Mail/fakesendmail.mbox"
+deliver="$MH_LIBEXEC_DIR/rcvpack $MH_TEST_DIR/Mail/fakesendmail.mbox"
found_dasht=0
for arg in "$@"; do
setup_test
# Use proper program, likely not the first one on PATH.
-dp="${MH_LIB_DIR}/dp"
+dp="${MH_LIBEXEC_DIR}/dp"
expected="$MH_TEST_DIR/$$.expected"
expected_err="$MH_TEST_DIR/$$.expected_err"
setup_test
# Use proper program, likely not the first one on PATH.
-fmtdump="${MH_LIB_DIR}/fmtdump"
+fmtdump="${MH_LIBEXEC_DIR}/fmtdump"
expected=$MH_TEST_DIR/$$.expected
expected_err=$MH_TEST_DIR/$$.expected_err
# We can use "ap" to get the output of format commands
-testoutput=`run_prog ${MH_LIB_DIR}/ap -format "%(localmbox)" ignore`
+testoutput=`run_prog ${MH_LIBEXEC_DIR}/ap -format "%(localmbox)" ignore`
if [ x"${testname}" != x"${testoutput}" ]; then
echo "Expected ${testname}, got ${testoutput}"
setup_test
host=`${MH_OBJ_DIR}/test/getcanon`
-run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "$host" \
"local hostname test"
cp ${MHMTSCONF} ${MH_TEST_DIR}/Mail/mts.conf || exit 1
echo "localname: some.random.name" >> ${MHMTSCONF}
-run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "some.random.name" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "some.random.name" \
"mts.conf localname test"
exit $failed
#### Local-Mailbox profile component, which we don't use in the test
#### suite, or the user's login name. ap will escape (quote) it if
#### needed.
-user=`run_prog ${MH_LIB_DIR}/ap -format '%(me)' 0`
+user=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(me)' 0`
host=`${MH_OBJ_DIR}/test/getcanon`
-output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"`
+output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}"`
run_test "echo $output" 1 "Basic user test"
-output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
run_test "echo $output" 1 "Basic user@host test"
-run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
0 "Basic non-matching test"
myname="Random User <random@user.something.com>"
echo "Local-Mailbox: ${myname}" >> ${MH}
run_test "echo \
- `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
+ `run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
1 "Local-Mailbox test"
-output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
run_test "echo $output" 0 "Local-mailbox overriding user@host test"
# Add an Alternate-Mailbox. This caused ismymbox() to lose the
# Alternate-Mailboxes.
printf 'Alternate-Mailboxes: user@example.com\n' >> $MH
run_test "echo \
- `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
+ `run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
1 "Local-Mailbox with Alternate-Mailbox test"
exit $failed
unset SIGNATURE
fullname=`${MH_OBJ_DIR}/test/getfullname`
-run_test "${MH_LIB_DIR}/ap -format %(myname) ignore" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myname) ignore" \
"$fullname" "GECOS field test"
echo "Signature: Some Random Name 1" >> ${MH}
-run_test "${MH_LIB_DIR}/ap -format %(myname) ignore" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myname) ignore" \
"Some Random Name 1" "MH Profile Signature test"
SIGNATURE="Some Random Name 2"
export SIGNATURE
-run_test "${MH_LIB_DIR}/ap -format %(myname) ignore" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myname) ignore" \
"${SIGNATURE}" "SIGNATURE Environment test"
#### Test escaping of display names.
setup_test
-actual=`run_prog ${MH_LIB_DIR}/ap -format "%-30(friendly{text})<<End of test" "No Such User <nosuch@user.com>"`
+actual=`run_prog ${MH_LIBEXEC_DIR}/ap -format "%-30(friendly{text})<<End of test" "No Such User <nosuch@user.com>"`
expected=" No Such User<<End of test"
##########123456789012345678901234567890
# Use maildrop specified in mts.conf, i.e.,
# ${MH_TEST_DIR}/Mail/maildrop, which should not yet exist.
-"${MH_LIB_DIR}"/rcvpack <"${MH_TEST_DIR}"/Mail/inbox/1 \
+"${MH_LIBEXEC_DIR}"/rcvpack <"${MH_TEST_DIR}"/Mail/inbox/1 \
"${MH_TEST_DIR}"/Mail/maildrop
# check with no arguments and mail waiting
. "$MH_OBJ_DIR/test/common.sh"
setup_test
-mhl="${MH_LIB_DIR}/mhl"
+mhl="${MH_LIBEXEC_DIR}/mhl"
expected="$MH_TEST_DIR/$$.expected"
actual="$MH_TEST_DIR/$$.actual"
$bindir/inc
more
$bindir/mhmail
-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$nmhexecdir/mhl
cat
600
$bindir/packf
-$MH_INST_DIR$auxexecdir/post
+$MH_INST_DIR$nmhexecdir/post
$bindir/send
$bindir/mhshow
-$MH_INST_DIR$auxexecdir/mhl
+$MH_INST_DIR$nmhexecdir/mhl
nmh-`cat ${srcdir}/VERSION`
$bindir/whatnow
$bindir/whom
-$sysconfdir
-${MH_LIB_DIR}
+$nmhetcdir
+$MH_LIBEXEC_DIR
fcntl
${default_locking}
EOF
whatnowproc \
whomproc \
etcdir \
-libdir \
+libexecdir \
datalocking \
spoollocking >$actual 2>&1
expected="$MH_TEST_DIR"/$$.expected
actual="$MH_TEST_DIR"/$$.actual
-mkstemp="${MH_LIB_DIR}/mkstemp"
+mkstemp="${MH_LIBEXEC_DIR}/mkstemp"
$mkstemp -help | grep suffix >/dev/null && has_mkstemps=1 || has_mkstemps=0
cd "$MHTMPDIR"
expected=$MH_TEST_DIR/$$.expected
actual=$MH_TEST_DIR/$$.actual
-localmbox=`$MH_LIB_DIR/ap -format "%(localmbox)" 0`
+localmbox=`$MH_LIBEXEC_DIR/ap -format "%(localmbox)" 0`
#### Use this script itself for the test file.
testfiledir="$srcdir/test/post"
testfile=`basename $0`
setup_test
# Use proper program, likely not the first one on PATH.
-rcvdist="${MH_LIB_DIR}/rcvdist"
+rcvdist="${MH_LIBEXEC_DIR}/rcvdist"
expected=$MH_TEST_DIR/$$.expected
actual=$MH_TEST_DIR/$$.actual
Date: Fri, 29 Sep 2006 00:00:00
Message-Id: 1@test.nmh
Subject: Testing message 1
-Resent-From: `${MH_LIB_DIR}/ap -format '%(localmbox)' 0 | \
+Resent-From: `${MH_LIBEXEC_DIR}/ap -format '%(localmbox)' 0 | \
sed 's/^<\(.*\)>$/\1/'`
Resent-To: recipient@example.com
Resent-Date:
setup_test
# Use proper program, likely not the first one on PATH.
-rcvpack="${MH_LIB_DIR}/rcvpack"
+rcvpack="${MH_LIBEXEC_DIR}/rcvpack"
expected="$MH_TEST_DIR/$$.expected"
actual="$MH_TEST_DIR/$$.actual"
setup_test
# Use proper program, likely not the first one on PATH.
-rcvstore="${MH_LIB_DIR}/rcvstore"
+rcvstore="${MH_LIBEXEC_DIR}/rcvstore"
expected=$MH_TEST_DIR/$$.expected
expected_err=$MH_TEST_DIR/$$.expected_err
setup_test
# Use proper program, likely not the first one on PATH.
-rcvtty="${MH_LIB_DIR}/rcvtty"
+rcvtty="${MH_LIBEXEC_DIR}/rcvtty"
expected="$MH_TEST_DIR/$$.expected"
actual="$MH_TEST_DIR/$$.actual"
setup_test
# Use proper program, maybe not the first one on PATH.
-slocal="$MH_LIB_DIR"/slocal
+slocal="$MH_LIBEXEC_DIR"/slocal
expected="$MH_TEST_DIR"/$$.expected
actual="$MH_TEST_DIR"/$$.actual
# Use current login for address, user, etc., because it must be an
# existing user on the host.
-me=`"$MH_LIB_DIR"/ap -format '%(me)' 0`
+me=`"$MH_LIBEXEC_DIR"/ap -format '%(me)' 0`
# check -addr
cat >"$md" <<EOF
bindir=`finddir $0`
nmhbindir=`cd "$bindir" && pwd`
-nmhlibdir=`$nmhbindir/mhparam libdir`
+nmhlibexecdir=`$nmhbindir/mhparam libexecdir`
case `printf 'OK\n' | tail -n 1 2>&1` in
OK) tail='tail -n ' ;;
*) tail='tail -' ;;
die 'Usage: mhmail [-t(o)] addrs ... [switches]'
fi
if [ "$from"x = x ]; then
- from=`${nmhlibdir}/ap -format '%(localmbox)' 0`
+ from=`${nmhlibexecdir}/ap -format '%(localmbox)' 0`
fi
#### Check for missing mandatory arguments.
#### .orig file, so it will remove them, too.
umask 077
tmpdir="${MHTMPDIR:-${TMPDIR:-`$nmhbindir/mhpath +`}}"
-tmpfilename=`cd "$tmpdir" && "${nmhlibdir}/mkstemp" -p mhmail`
+tmpfilename=`cd "$tmpdir" && "${nmhlibexecdir}/mkstemp" -p mhmail`
[ $? -ne 0 ] && die "mhmail: failed to create temporary file in $tmpdir"
tmpfile="$tmpdir/$tmpfilename"
backup_char=`"$nmhbindir"/mhparam sbackup`
#### When resending with send, tmpfile will just contain the
#### Resent- header fields. "$tmpfileresent" will contain
#### the message that is being resent.
- tmpfileresent=`"${nmhlibdir}/mkstemp" -d "$tmpdir" -p mhmail-resent`
+ tmpfileresent=`"${nmhlibexecdir}/mkstemp" -d "$tmpdir" -p mhmail-resent`
[ $? -ne 0 ] && die "mhmail: failed to create temporary file in $tmpdir"
mhdist=1; export mhdist
mhaltmsg=$tmpfileresent; export mhaltmsg
DEFINE_SWITCH_ARRAY(MHPARAM, switches);
#undef X
-extern char *mhlibdir;
extern char *mhetcdir;
+extern char *mhlibexecdir;
static char *sbackup = BACKUP_PREFIX;
{ "whatnowproc", &whatnowproc },
{ "whomproc", &whomproc },
{ "etcdir", &mhetcdir },
- { "libdir", &mhlibdir },
+ { "libdir", &mhlibexecdir },
+ { "libexecdir", &mhlibexecdir },
{ "localmbox", &localmbox },
{ "sbackup", &sbackup },
{ "datalocking", &datalocking },
prefix='@prefix@'
exec_prefix="@exec_prefix@"
-exec "@libdir@/post" -mts sendmail/pipe "$@"
+exec "@libexecdir@/nmh/post" -mts sendmail/pipe "$@"
projects / nmh / commitdiff