From: Lyndon Nerenberg Date: Sun, 5 Oct 2014 05:49:01 +0000 (-0700) Subject: New locations for config files and support binaries, and smarter default for install... X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/46f35e659f3bc3e808a70263bea0ec72624c8a08?ds=inline;hp=--cc New locations for config files and support binaries, and smarter default for install root directory. The default locations for config files and back-end executables has changed. Config files have moved from ${sysconfdir} to ${sysconfdir}/nmh, and the back-end programs from ${libdir} to ${libexecdir}/nmh. The only user-visible change is the addition of a new mhparam(1) component 'libexecdir', which replaces the previous 'libdir'. User scripts invoking 'mhparam libdir' will need an update. 'libdir' has been kept around for the time being, to give people a chance to update their scripts. It returns the same value as 'libexecdir'. 'libdir' has been marked deprecated in the mhparam(1) manpage and the release notes; it will be removed in a couple of releases. In conjunction with this change there was an opportunity to do a bit of Makefile cleanup. The old 'auxexec' construct has been replaced with a new scheme that leverages automake's templating. The auxexec_* references have been replaced with nmhlibexec_* forms, and a corresponding nmhlibexecdir variable defined as ${libexecdir}/nmh. Likewise, etcdir has been replaced with nmhetcdir. These name changes have percolated downstream to some extent, primarily in the man pages and test scripts. Finally, configure has been made a bit smarter about setting the default ${prefix}. If it finds an existing nmh installation, it will set the default ${prefix} to match, falling back to /usr/local/nmh. configure looks for an existing installation by searching $PATH for a viable mhparam binary. --- 46f35e659f3bc3e808a70263bea0ec72624c8a08 diff --git a/INSTALL b/INSTALL index eb2971d3..6ea100d8 100644 --- a/INSTALL +++ b/INSTALL @@ -184,11 +184,13 @@ Options for configure --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. diff --git a/Makefile.am b/Makefile.am index e4209a58..7ffcf9b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,18 +25,18 @@ MHNSEARCHPATH = "$(PATH)" 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) \ @@ -152,13 +152,13 @@ bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \ 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 @@ -187,7 +187,7 @@ noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \ ## ## 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 \ @@ -202,7 +202,7 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \ ## 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 @@ -410,7 +410,7 @@ uip_whom_SOURCES = uip/whom.c uip/distsbr.c 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 @@ -596,10 +596,10 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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 @@ -617,10 +617,10 @@ $(man_MANS): man/man.sed 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' >> $@ diff --git a/config/config.c b/config/config.c index 3971d528..a5cdfd9b 100644 --- a/config/config.c +++ b/config/config.c @@ -12,7 +12,7 @@ #define nmhbindir(file) NMHBINDIR#file #define nmhetcdir(file) NMHETCDIR#file -#define nmhlibdir(file) NMHLIBDIR#file +#define nmhlibexecdir(file) NMHLIBEXECDIR#file /* @@ -143,7 +143,7 @@ char *nmhaccessftp = "nmh-access-ftp"; /* profile entry for external url access command */ char *nmhaccessurl = "nmh-access-url"; -char *mhlibdir = NMHLIBDIR; +char *mhlibexecdir = NMHLIBEXECDIR; char *mhetcdir = NMHETCDIR; /* @@ -239,7 +239,7 @@ char *moreproc = NULL; * for "Bcc:" recipients. */ -char *mhlproc = nmhlibdir (/mhl); +char *mhlproc = nmhlibexecdir (/mhl); /* * This is the super handy BBoard reading program, which is @@ -259,14 +259,14 @@ char *packproc = nmhbindir (/packf); * 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. @@ -296,7 +296,7 @@ char *showmimeproc = nmhbindir (/mhshow); * 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 diff --git a/configure.ac b/configure.ac index 88f7e65d..e0a96f5d 100644 --- a/configure.ac +++ b/configure.ac @@ -74,10 +74,12 @@ AS_IF([test -n "$with_smtpservers"], [smtpservers="$with_smtpservers"], [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 @@ -563,7 +565,7 @@ dnl the final summary and should use them nowhere else (see the autoconf 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}"; @@ -578,8 +580,8 @@ linker flags : ${LDFLAGS} 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} diff --git a/docs/pending-release-notes b/docs/pending-release-notes index ba30e591..07c073ab 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -15,6 +15,15 @@ NEW FEATURES - 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 @@ -34,6 +43,9 @@ DEPRECATED 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 diff --git a/etc/sendfiles b/etc/sendfiles index 99c170e0..85e8a49a 100755 --- a/etc/sendfiles +++ b/etc/sendfiles @@ -38,7 +38,7 @@ die() { bindir=`finddir $0` nmhbindir=`cd "$bindir" && pwd` -nmhlibdir=`$nmhbindir/mhparam libdir` +nmhlibexecdir=`$nmhbindir/mhparam libexecdir` #### Process switches. @@ -67,7 +67,7 @@ for arg in "$@"; do -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" @@ -136,7 +136,7 @@ checkforargs 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 @@ -170,7 +170,7 @@ esac #### 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 diff --git a/man/ali.man b/man/ali.man index b50e4446..791adc8d 100644 --- a/man/ali.man +++ b/man/ali.man @@ -62,7 +62,7 @@ then it's accessed directly; otherwise tilde expansion is done on 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 @@ -84,7 +84,7 @@ For a default alias file .PD 0 .TP 20 aliasfile -%etcdir%/MailAliases +%nmhetcdir%/MailAliases .TP \-nolist .TP diff --git a/man/ap.man b/man/ap.man index 4e0b4f1c..375a4fa1 100644 --- a/man/ap.man +++ b/man/ap.man @@ -7,7 +7,7 @@ ap \- parse addresses RFC 822-style .SH SYNOPSIS .HP 5 .na -.B %libdir%/ap +.B %nmhlibexecdir%/ap .RB [ \-form .IR formatfile ] .RB [ \-format @@ -75,7 +75,7 @@ the address. $HOME/\&.mh\(ruprofile The user's profile. .TP -%etcdir%/mts.conf +%nmhetcdir%/mts.conf The mts configuration file. .PD .SH "PROFILE COMPONENTS" diff --git a/man/comp.man b/man/comp.man index d0e86066..225c8eb0 100644 --- a/man/comp.man +++ b/man/comp.man @@ -244,7 +244,7 @@ No mail is actually sent. .SH FILES .PD 0 .TP 20 -%etcdir%/components +%nmhetcdir%/components The standard message skeleton. .TP /components diff --git a/man/dist.man b/man/dist.man index 4675b2c5..d8beb2b5 100644 --- a/man/dist.man +++ b/man/dist.man @@ -210,8 +210,8 @@ will prevent any edit from occurring.) .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 /distcomps~^Rather than the standard skeleton ^$HOME/\&.mh\(ruprofile~^The user profile ^/draft~^The draft file diff --git a/man/dp.man b/man/dp.man index a90028e5..f3a3dfdd 100644 --- a/man/dp.man +++ b/man/dp.man @@ -7,7 +7,7 @@ dp \- parse dates RFC 822-style .SH SYNOPSIS .HP 5 .na -.B %libdir%/dp +.B %nmhlibexecdir%/dp .RB [ \-form .IR formatfile ] .RB [ \-format diff --git a/man/fmtdump.man b/man/fmtdump.man index 9345d641..a897a7e8 100644 --- a/man/fmtdump.man +++ b/man/fmtdump.man @@ -7,7 +7,7 @@ fmtdump \- decode nmh format files .SH SYNOPSIS .HP 5 .na -.B %libdir%/fmtdump +.B %nmhlibexecdir%/fmtdump .RB [ \-form .IR formatfile ] .RB [ \-format @@ -41,7 +41,7 @@ for the details. $HOME/.mh_profile The user's profile. .TP -%etcdir%/scan.default +%nmhetcdir%/scan.default The default format file. .PD .SH "PROFILE COMPONENTS" diff --git a/man/fmttest.man b/man/fmttest.man index a8f145bb..e92586af 100644 --- a/man/fmttest.man +++ b/man/fmttest.man @@ -69,7 +69,7 @@ rules: absolute pathnames are accessed directly, tilde expansion 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. .SS MODE SELECTION AND COMPONENT SPECIFICATION .B Fmttest diff --git a/man/forw.man b/man/forw.man index 362fadea..13ccfdb8 100644 --- a/man/forw.man +++ b/man/forw.man @@ -386,18 +386,18 @@ pathnames are accessed directly, tilde expansion 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 .PD 0 .TP 25 -%etcdir%/forwcomps +%nmhetcdir%/forwcomps The standard message skeleton. .TP /forwcomps Rather than the standard skeleton. .TP -%etcdir%/digestcomps +%nmhetcdir%/digestcomps The message skeleton if .B \-digest is given. @@ -405,7 +405,7 @@ is given. /digestcomps Rather than the standard skeleton. .TP -^%etcdir%/mhl.forward +^%nmhetcdir%/mhl.forward The standard message filter. .TP /mhl.forward diff --git a/man/inc.man b/man/inc.man index 9b7068c9..61f6f844 100644 --- a/man/inc.man +++ b/man/inc.man @@ -270,7 +270,7 @@ switch. $HOME/.mh_profile The user's profile. .TP -%etcdir%/mts.conf +%nmhetcdir%/mts.conf mts configuration file. .TP %mailspool%/$USER diff --git a/man/install-mh.man b/man/install-mh.man index 725ea1f2..4fd87f1b 100644 --- a/man/install-mh.man +++ b/man/install-mh.man @@ -7,7 +7,7 @@ install-mh \- initialize the nmh environment .SH SYNOPSIS .HP 5 .na -.B %libdir%/install\-mh +.B %nmhlibexecdir%/install\-mh .RB [ \-auto ] .RB [ \-check ] .RB [ \-version ] @@ -58,7 +58,7 @@ When creating the users initial .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 @@ -72,7 +72,7 @@ been installed without their having to know the internals of nmh. $HOME/.mh_profile The user's profile. .TP -%etcdir%/mh.profile +%nmhetcdir%/mh.profile Used to initialize user's profile. .PD .SH "PROFILE COMPONENTS" diff --git a/man/mh-alias.man b/man/mh-alias.man index ad047c31..7ebbf0f8 100644 --- a/man/mh-alias.man +++ b/man/mh-alias.man @@ -127,7 +127,7 @@ Example Alias File .PP .RS 5 .nf -<%etcdir%/BBoardAliases +<%nmhetcdir%/BBoardAliases fred: frated@UCI.example sgroup: fred, fear, freida b-people: Blind List: bill, betty @@ -140,7 +140,7 @@ news.*: news .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, @@ -173,7 +173,7 @@ Aliasfile: Default alias file. .SH FILES .TP 20 -%etcdir%/MailAliases +%nmhetcdir%/MailAliases System-wide default alias file. .SH "SEE ALSO" .IR ali (1), diff --git a/man/mh-mail.man b/man/mh-mail.man index b14c8101..c317ffd9 100644 --- a/man/mh-mail.man +++ b/man/mh-mail.man @@ -309,7 +309,7 @@ for more information. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^%mailspool%/$USER~^Location of mail drop .fi .SH "SEE ALSO" diff --git a/man/mh-mime.man b/man/mh-mime.man index 7be11bb9..51f0607c 100644 --- a/man/mh-mime.man +++ b/man/mh-mime.man @@ -49,7 +49,7 @@ will automatically decode MIME-encoded headers. If you have a custom 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 diff --git a/man/mh-mkstemp.man b/man/mh-mkstemp.man index a3df5836..a7eceb7b 100644 --- a/man/mh-mkstemp.man +++ b/man/mh-mkstemp.man @@ -7,7 +7,7 @@ mkstemp \- create a temporary file .SH SYNOPSIS .HP 5 .na -.B %libdir%/mkstemp +.B %nmhlibexecdir%/mkstemp .RB [ \-directory .IR directory ] .RB [ \-prefix diff --git a/man/mh-profile.man b/man/mh-profile.man index 2c1b3d7a..81e2ccbe 100644 --- a/man/mh-profile.man +++ b/man/mh-profile.man @@ -545,7 +545,7 @@ It is used to retrieve an external-body with access-type `mail-server' .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 @@ -597,7 +597,7 @@ Currently not used. .RE .PP .BR postproc : -%libdir%/post +%nmhlibexecdir%/post .RS 5 This is the program used by .BR send , @@ -645,7 +645,7 @@ to process and display non-text (MIME) messages. .RE .PP .BR showproc : -%libdir%/mhl +%nmhlibexecdir%/mhl .RS 5 This is the program used by .B show @@ -675,7 +675,7 @@ to determine to whom a message would be sent. 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. @@ -1035,7 +1035,7 @@ if annotations are to occur. .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 ^/context~^The user context diff --git a/man/mh-sequence.man b/man/mh-sequence.man index 0f876e97..ef82acfa 100644 --- a/man/mh-sequence.man +++ b/man/mh-sequence.man @@ -322,7 +322,7 @@ one command's messages not appearing on the requested sequence. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile ^/context~^The user context ^/\&.mh\(rusequences~^File for public sequences diff --git a/man/mh-tailor.man b/man/mh-tailor.man index 38154acd..4b2362ff 100644 --- a/man/mh-tailor.man +++ b/man/mh-tailor.man @@ -6,7 +6,7 @@ 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. @@ -194,7 +194,7 @@ the following: .RE .PP .BR maildelivery : -%libdir%/maildelivery +%nmhlibexecdir%/maildelivery .RS 5 The name of the system-wide default .I maildelivery @@ -266,7 +266,7 @@ the named POP service host is consulted. .\" .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 @@ -315,8 +315,8 @@ your site, and set the appropriate values. .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 diff --git a/man/mhbuild.man b/man/mhbuild.man index a69ae7bd..4b261f33 100644 --- a/man/mhbuild.man +++ b/man/mhbuild.man @@ -664,7 +664,7 @@ Finally, will attempt to consult .PP .RS 5 -%etcdir%/mhn.defaults +%nmhetcdir%/mhn.defaults .RE .PP if it exists. @@ -748,15 +748,15 @@ locations: absolute pathnames are accessed directly, tilde expansion 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 ^ ~ diff --git a/man/mhfixmsg.man b/man/mhfixmsg.man index b817220f..81d069ba 100644 --- a/man/mhfixmsg.man +++ b/man/mhfixmsg.man @@ -120,7 +120,7 @@ uses its mhshow-show-text/subtype entries. When .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 @@ -208,7 +208,7 @@ to add a single transformed message to a different folder, e.g., .RS 5 mhfixmsg -outfile - | \\ .RS 0 -%libdir%/rcvstore +folder +%nmhlibexecdir%/rcvstore +folder .RE .RE .SS Summary of Applicability @@ -290,7 +290,7 @@ MAILDIR = `mhparam path` #### 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 @@ -305,14 +305,14 @@ accessed directly, tilde expansion 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%/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 ^ ~ diff --git a/man/mhl.man b/man/mhl.man index 38e13649..8d1d5a3b 100644 --- a/man/mhl.man +++ b/man/mhl.man @@ -7,7 +7,7 @@ mhl \- produce formatted listings of nmh messages .SH SYNOPSIS .HP 5 .na -.B %libdir%/mhl +.B %nmhlibexecdir%/mhl .RB [ \-bell " | " \-nobell ] .RB [ \-clear " | " \-noclear ] .RB [ \-folder @@ -129,7 +129,7 @@ is called 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 @@ -364,8 +364,8 @@ options can be used to build up multiple arguments to the format filter. .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 /mhl.format~^Rather than the standard template ^$HOME/\&.mh\(ruprofile~^The user profile .fi diff --git a/man/mhlist.man b/man/mhlist.man index 4ed45830..a75e50d8 100644 --- a/man/mhlist.man +++ b/man/mhlist.man @@ -169,7 +169,7 @@ integrity of the content. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/mhmail.man b/man/mhmail.man index 2061762c..e39f7ecc 100644 --- a/man/mhmail.man +++ b/man/mhmail.man @@ -226,9 +226,9 @@ is used. .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" diff --git a/man/mhparam.man b/man/mhparam.man index 9629f582..dfa5aacc 100644 --- a/man/mhparam.man +++ b/man/mhparam.man @@ -44,13 +44,13 @@ If 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 @@ -80,6 +80,12 @@ 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 @@ -89,7 +95,7 @@ Examples: Mail % mhparam mhlproc -%libdir%/mhl +%nmhlibexecdir%/mhl % mhparam \-component Path Path: Mail @@ -110,10 +116,10 @@ context: context %nmhversion% % mhparam etcdir -%etcdir% +%nmhetcdir% -% mhparam libdir -%libdir% +% mhparam libexecdir +%nmhlibexecdir% % mhparam spoollocking %default_locking% diff --git a/man/mhshow.man b/man/mhshow.man index ac228f06..10104255 100644 --- a/man/mhshow.man +++ b/man/mhshow.man @@ -587,7 +587,7 @@ need be present in this additional profile. Finally, will attempt to consult .PP .RS 5 -%etcdir%/mhn.defaults +%nmhetcdir%/mhn.defaults .RE .PP which is created automatically during @@ -644,17 +644,17 @@ absolute pathnames are accessed directly, tilde expansion 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 ^$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 ^ ~ diff --git a/man/mhstore.man b/man/mhstore.man index 14faaa0e..fe50d253 100644 --- a/man/mhstore.man +++ b/man/mhstore.man @@ -522,7 +522,7 @@ Finally, will attempt to consult .PP .RS 5 -%etcdir%/mhn.defaults +%nmhetcdir%/mhn.defaults .RE .PP which is created automatically during @@ -539,15 +539,15 @@ pathnames are accessed directly, tilde expansion 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 ^$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 ^ ~ diff --git a/man/msgchk.man b/man/msgchk.man index 48e2e83e..0d5d6c98 100644 --- a/man/msgchk.man +++ b/man/msgchk.man @@ -123,9 +123,9 @@ switch. .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" diff --git a/man/new.man b/man/new.man index 7f93b9a3..e95e7de7 100644 --- a/man/new.man +++ b/man/new.man @@ -84,7 +84,7 @@ for each matching folder. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/next.man b/man/next.man index 9138c1cf..9e246287 100644 --- a/man/next.man +++ b/man/next.man @@ -45,7 +45,7 @@ details. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/nmh.man b/man/nmh.man index f3e9ccbe..cf143305 100644 --- a/man/nmh.man +++ b/man/nmh.man @@ -530,12 +530,12 @@ contains .B nmh commands .TP -%etcdir% +%nmhetcdir% contains .B nmh format files .TP -%libdir% +%nmhlibexecdir% contains .B nmh library commands diff --git a/man/packf.man b/man/packf.man index 898f0b0d..5f2aef5f 100644 --- a/man/packf.man +++ b/man/packf.man @@ -60,7 +60,7 @@ can be unpacked using .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 diff --git a/man/pick.man b/man/pick.man index e023db5c..000da224 100644 --- a/man/pick.man +++ b/man/pick.man @@ -329,7 +329,7 @@ when it fails. This lets the outer command fail gracefully as well. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/post.man b/man/post.man index a1fb3160..a9745ee2 100644 --- a/man/post.man +++ b/man/post.man @@ -7,7 +7,7 @@ post \- deliver a message .SH SYNOPSIS .HP 5 .na -.B %libdir%/post +.B %nmhlibexecdir%/post .RB [ \-alias .IR aliasfile ] .RB [ \-filter @@ -179,7 +179,7 @@ will be instructed to not send any bounces in response to the message. 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. @@ -191,7 +191,7 @@ and the 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 @@ -258,11 +258,11 @@ used for that service. .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 @@ -282,7 +282,7 @@ consult the user's (RFC 822) .SH DEFAULTS .nf -.RB ` \-alias "' defaults to %etcdir%/MailAliases" +.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases" .RB ` \-format ' .RB ` \-nomime ' .RB ` \-nomsgid ' diff --git a/man/prev.man b/man/prev.man index 71eb8f7b..7dd54459 100644 --- a/man/prev.man +++ b/man/prev.man @@ -43,7 +43,7 @@ for all the details. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/prompter.man b/man/prompter.man index 9e3263ad..96e15b38 100644 --- a/man/prompter.man +++ b/man/prompter.man @@ -140,7 +140,7 @@ the draft file, and subsequent non\-flag arguments are ignored. .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 diff --git a/man/rcvdist.man b/man/rcvdist.man index 6b4af631..2cb7f810 100644 --- a/man/rcvdist.man +++ b/man/rcvdist.man @@ -7,7 +7,7 @@ rcvdist \- asynchronously redistribute new mail .SH SYNOPSIS .HP 5 .na -.B %libdir%/rcvdist +.B %nmhlibexecdir%/rcvdist .RB [ \-form .IR formfile ] [switches\ for @@ -66,12 +66,12 @@ profile component. .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 /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), diff --git a/man/rcvpack.man b/man/rcvpack.man index fc18abeb..7be89dbe 100644 --- a/man/rcvpack.man +++ b/man/rcvpack.man @@ -7,7 +7,7 @@ rcvpack \- append message to file .SH SYNOPSIS .HP 5 .na -.B %libdir%/rcvpack +.B %nmhlibexecdir%/rcvpack .I file .RB [ \-mbox ] .RB [ \-mmdf ] @@ -46,8 +46,8 @@ shell scripts. .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), diff --git a/man/rcvstore.man b/man/rcvstore.man index 3ed56fe3..81742790 100644 --- a/man/rcvstore.man +++ b/man/rcvstore.man @@ -7,7 +7,7 @@ rcvstore \- asynchronously incorporate mail into a folder .SH SYNOPSIS .HP 5 .na -.B %libdir%/rcvstore +.B %nmhlibexecdir%/rcvstore .RI [ +folder ] .RB [ \-create " | " \-nocreate ] .RB [ \-unseen " | " \-nounseen ] @@ -112,7 +112,7 @@ entry. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/rcvtty.man b/man/rcvtty.man index 8b9dd446..942caf80 100644 --- a/man/rcvtty.man +++ b/man/rcvtty.man @@ -7,7 +7,7 @@ rcvtty \- report new mail .SH SYNOPSIS .HP 5 .na -.B %libdir%/rcvtty +.B %nmhlibexecdir%/rcvtty .RI [ command ] .RB [ \-form .IR formatfile ] @@ -101,10 +101,10 @@ instead. .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 diff --git a/man/refile.man b/man/refile.man index 1acc3800..d4dfbacc 100644 --- a/man/refile.man +++ b/man/refile.man @@ -178,7 +178,7 @@ to file the /draft. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/repl.man b/man/repl.man index fe87c856..72325e50 100644 --- a/man/repl.man +++ b/man/repl.man @@ -477,17 +477,17 @@ absolute pathnames are accessed directly, tilde expansion 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 -^%etcdir%/replcomps~^The standard reply template +.ta \w'%nmhetcdir%/ExtraBigFileName 'u +^%nmhetcdir%/replcomps~^The standard reply template ^or /replcomps~^Rather than the standard template -^%etcdir%/replgroupcomps~^The standard `reply -group' template +^%nmhetcdir%/replgroupcomps~^The standard `reply -group' template ^or /replgroupcomps~^Rather than the standard template -^%etcdir%/mhl.reply~^The standard message filter +^%nmhetcdir%/mhl.reply~^The standard message filter ^or /mhl.reply~^Rather than the standard filter ^$HOME/\&.mh\(ruprofile~^The user profile ^/draft~^The draft file diff --git a/man/rmf.man b/man/rmf.man index 0003735f..d4f5fb9c 100644 --- a/man/rmf.man +++ b/man/rmf.man @@ -57,7 +57,7 @@ use it with caution. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/rmm.man b/man/rmm.man index d1b12c83..88670397 100644 --- a/man/rmm.man +++ b/man/rmm.man @@ -65,7 +65,7 @@ switches. 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 @@ -94,7 +94,7 @@ advance to the next message in the folder as expected. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/scan.man b/man/scan.man index 17a702ca..d63e280e 100644 --- a/man/scan.man +++ b/man/scan.man @@ -193,7 +193,7 @@ scanning a draft folder, as message drafts usually aren't allowed to have dates in them. .PP The -.B %etcdir% +.B %nmhetcdir% directory contains several format files as examples of customized .B scan output. @@ -210,7 +210,7 @@ purists hate this idea. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/send.man b/man/send.man index 6e22bba2..83333673 100644 --- a/man/send.man +++ b/man/send.man @@ -362,7 +362,7 @@ switch, the user can direct 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. @@ -372,7 +372,7 @@ If nmh is using the SMTP MTA, the 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 @@ -456,7 +456,7 @@ for more information. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" @@ -487,7 +487,7 @@ for more information. .SH DEFAULTS .nf .RB ` file "' defaults to /draft" -.RB ` \-alias "' defaults to %etcdir%/MailAliases" +.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases" .RB ` \-nodraftfolder ' .RB ` \-nofilter ' .RB ` \-format ' diff --git a/man/sendfiles.man b/man/sendfiles.man index ba1fef00..51c60636 100644 --- a/man/sendfiles.man +++ b/man/sendfiles.man @@ -176,7 +176,7 @@ to perform the extraction. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/show.man b/man/show.man index 04589fb6..a248e6ac 100644 --- a/man/show.man +++ b/man/show.man @@ -166,7 +166,7 @@ from each sequence named by the profile entry. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/slocal.man b/man/slocal.man index a7624241..53f9314a 100644 --- a/man/slocal.man +++ b/man/slocal.man @@ -7,7 +7,7 @@ slocal \- asynchronously filter and deliver new mail .SH SYNOPSIS .HP 5 .na -.B %libdir%/slocal +.B %nmhlibexecdir%/slocal .RB [ \-addr .IR address ] .RB [ \-info @@ -126,7 +126,7 @@ support a \&.forward file for directing incoming mail. 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 @@ -286,7 +286,7 @@ file cannot be found, or does not 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 @@ -327,7 +327,7 @@ From steve destroy A \- 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 @@ -364,10 +364,10 @@ quicker delivery into your maildrop. .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" diff --git a/man/sortm.man b/man/sortm.man index 4372d963..e8a13b97 100644 --- a/man/sortm.man +++ b/man/sortm.man @@ -118,7 +118,7 @@ dates, their original message order is preserved. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" diff --git a/man/whatnow.man b/man/whatnow.man index c1f735b9..ad3560de 100644 --- a/man/whatnow.man +++ b/man/whatnow.man @@ -211,7 +211,7 @@ commands for managing MIME attachments. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile ^/draft~^The draft file .fi diff --git a/man/whom.man b/man/whom.man index 9df87b60..da7aee2e 100644 --- a/man/whom.man +++ b/man/whom.man @@ -58,7 +58,7 @@ useful) feature. Consult the 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. @@ -68,7 +68,7 @@ If nmh is using the SMTP MTA, the 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 @@ -133,7 +133,7 @@ for more information. .SH FILES .fc ^ ~ .nf -.ta \w'%etcdir%/ExtraBigFileName 'u +.ta \w'%nmhetcdir%/ExtraBigFileName 'u ^$HOME/\&.mh\(ruprofile~^The user profile .fi .SH "PROFILE COMPONENTS" @@ -154,7 +154,7 @@ for more information. .nf .RB ` file "' defaults to /draft" .RB ` \-nocheck ' -.RB ` \-alias "' defaults to %etcdir%/MailAliases" +.RB ` \-alias "' defaults to %nmhetcdir%/MailAliases" .fi .SH CONTEXT None diff --git a/test/common.sh.in b/test/common.sh.in index f4225e1b..004c8b1f 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -9,15 +9,15 @@ test -z "$MH_TEST_DIR" && MH_TEST_DIR="$MH_OBJ_DIR/test/testdir" 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" @@ -246,9 +246,9 @@ run_test() { 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 @@ -285,12 +285,12 @@ setup_test () 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 \ @@ -299,7 +299,7 @@ EOF 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 diff --git a/test/dist/test-dist b/test/dist/test-dist index 0d0d7b04..2f1e4f3e 100755 --- a/test/dist/test-dist +++ b/test/dist/test-dist @@ -20,7 +20,7 @@ expected=$MH_TEST_DIR/$$.expected 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" diff --git a/test/fakesendmail b/test/fakesendmail index 97f63b15..37b6e309 100755 --- a/test/fakesendmail +++ b/test/fakesendmail @@ -15,7 +15,7 @@ if [ "$MH_TEST_DIR"x = x ]; then 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 diff --git a/test/format/test-dp b/test/format/test-dp index 43a39e91..b190d733 100755 --- a/test/format/test-dp +++ b/test/format/test-dp @@ -17,7 +17,7 @@ fi 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" diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump index c7d89833..b10374c1 100755 --- a/test/format/test-fmtdump +++ b/test/format/test-fmtdump @@ -17,7 +17,7 @@ fi 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 diff --git a/test/format/test-localmbox b/test/format/test-localmbox index e4956410..32a38565 100755 --- a/test/format/test-localmbox +++ b/test/format/test-localmbox @@ -23,7 +23,7 @@ echo "Local-Mailbox: ${testname}" >> ${MH} # 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}" diff --git a/test/format/test-myhost b/test/format/test-myhost index 2290f2a7..cb82846a 100755 --- a/test/format/test-myhost +++ b/test/format/test-myhost @@ -14,7 +14,7 @@ fi 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 @@ -22,7 +22,7 @@ MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf" 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 diff --git a/test/format/test-mymbox b/test/format/test-mymbox index f71a3c92..753f92e7 100755 --- a/test/format/test-mymbox +++ b/test/format/test-mymbox @@ -17,14 +17,14 @@ setup_test #### 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 " @@ -36,10 +36,10 @@ mv -f ${MH}.new ${MH} 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 @@ -47,7 +47,7 @@ run_test "echo $output" 0 "Local-mailbox overriding user@host test" # 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 diff --git a/test/format/test-myname b/test/format/test-myname index dda0f37b..864f1bbd 100755 --- a/test/format/test-myname +++ b/test/format/test-myname @@ -18,18 +18,18 @@ setup_test 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. diff --git a/test/format/test-rightjustify b/test/format/test-rightjustify index f482db4f..6ad7e4eb 100755 --- a/test/format/test-rightjustify +++ b/test/format/test-rightjustify @@ -12,7 +12,7 @@ fi setup_test -actual=`run_prog ${MH_LIB_DIR}/ap -format "%-30(friendly{text})<"` +actual=`run_prog ${MH_LIBEXEC_DIR}/ap -format "%-30(friendly{text})<"` expected=" No Such User<$actual 2>&1 diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp index e5a91b57..084f649a 100755 --- a/test/mkstemp/test-mkstemp +++ b/test/mkstemp/test-mkstemp @@ -19,7 +19,7 @@ setup_test 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" diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles index c5f08c00..64bf2696 100755 --- a/test/post/test-sendfiles +++ b/test/post/test-sendfiles @@ -18,7 +18,7 @@ setup_test 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` diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist index e69e140e..eca96860 100755 --- a/test/rcv/test-rcvdist +++ b/test/rcv/test-rcvdist @@ -17,7 +17,7 @@ fi 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 @@ -81,7 +81,7 @@ To: Some User 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: diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack index ae2b294c..958504c6 100755 --- a/test/rcv/test-rcvpack +++ b/test/rcv/test-rcvpack @@ -17,7 +17,7 @@ fi 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" diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore index 6445f69a..9656f373 100755 --- a/test/rcv/test-rcvstore +++ b/test/rcv/test-rcvstore @@ -17,7 +17,7 @@ fi 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 diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty index f0c58d14..f0e6558f 100755 --- a/test/rcv/test-rcvtty +++ b/test/rcv/test-rcvtty @@ -17,7 +17,7 @@ fi 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" diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal index cadda353..08eb1a80 100755 --- a/test/slocal/test-slocal +++ b/test/slocal/test-slocal @@ -17,7 +17,7 @@ fi 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 @@ -145,7 +145,7 @@ check "$MH_TEST_DIR/Mail/inbox/5" "$actual2" 'keep first' # 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" <&1` in OK) tail='tail -n ' ;; *) tail='tail -' ;; @@ -189,7 +189,7 @@ if [ "$tolist"x = x ]; then 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. @@ -215,7 +215,7 @@ fi #### .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` @@ -236,7 +236,7 @@ else #### 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 diff --git a/uip/mhparam.c b/uip/mhparam.c index bd22470c..acb416c7 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -29,8 +29,8 @@ DEFINE_SWITCH_ENUM(MHPARAM); DEFINE_SWITCH_ARRAY(MHPARAM, switches); #undef X -extern char *mhlibdir; extern char *mhetcdir; +extern char *mhlibexecdir; static char *sbackup = BACKUP_PREFIX; @@ -105,7 +105,8 @@ static struct proc procs [] = { { "whatnowproc", &whatnowproc }, { "whomproc", &whomproc }, { "etcdir", &mhetcdir }, - { "libdir", &mhlibdir }, + { "libdir", &mhlibexecdir }, + { "libexecdir", &mhlibexecdir }, { "localmbox", &localmbox }, { "sbackup", &sbackup }, { "datalocking", &datalocking }, diff --git a/uip/spost.in b/uip/spost.in index e5ee130e..777fdb94 100644 --- a/uip/spost.in +++ b/uip/spost.in @@ -10,4 +10,4 @@ prefix='@prefix@' exec_prefix="@exec_prefix@" -exec "@libdir@/post" -mts sendmail/pipe "$@" +exec "@libexecdir@/nmh/post" -mts sendmail/pipe "$@"