X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e6917522a770cf2dba9997ca047977bc55fac061..3b640c422bd716ab7246d72b1ea3b35dff533e29:/uip/mhparam.c?ds=inline

diff --git a/uip/mhparam.c b/uip/mhparam.c
index bb2f7d2f..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 },
@@ -189,16 +190,20 @@ main(int argc, char **argv)
 	    advise(NULL, "-%scomponents ignored with -all",
 		   components ? "" : "no");
 
-	/* print all entries in context/profile list */
+	/* Print all entries in context/profile list.  That does not
+	   include entries in mts.conf, such as spoollocking. */
 	for (np = m_defs; np; np = np->n_next)
 	    printf("%s: %s\n", np->n_name, np->n_field);
 
     } else if (debug) {
 	struct proc *ps;
 
-	/* Need to see if datalocking was set in profile. */
+	/* In case datalocking was set in profile. */
 	if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
+	/* In case spoollocking was set in mts.conf. */
+	mts_init(invo_name);
+
 	/* Also set localmbox here */
 	if (! localmbox_primed) {
 	    localmbox = getlocalmbox();
@@ -220,6 +225,11 @@ main(int argc, char **argv)
 	for (i = 0; i < compp; i++)  {
 	    register char *value;
 
+	    if (! strcmp ("spoollocking", comps[i])) {
+		/* In case spoollocking was set in mts.conf. */
+		mts_init(invo_name);
+            }
+
 	    value = context_find (comps[i]);
 	    if (!value)
 		value = p_find (comps[i]);