From 89d69fbd2ae1f9c8c989850ec7057814c655a727 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sat, 21 May 2016 09:15:56 -0400
Subject: [PATCH] Added docdir to mhparam.

---
 Makefile.am     | 9 ++++++---
 config/config.c | 6 ++++--
 configure.ac    | 4 +++-
 man/mhparam.man | 7 ++++---
 uip/mhparam.c   | 8 +++++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 92d70914..42de3252 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -616,10 +616,13 @@ 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='"@nmhetcdirinst@$(nmhetcdir)"' \
+sbr_libmh_a_CPPFLAGS = -I./sbr \
+		-DNMHBINDIR='"$(bindir)"' \
+		-DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
+		-DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
+		-DNMHDOCDIR='"@docdir@"' \
 		-DMAILSPOOL='"$(mailspool)"' \
-		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-		-DNMHLIBEXECDIR='"$(nmhlibexecdir)"'
+		-DSENDMAILPATH='"$(sendmailpath)"'
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
diff --git a/config/config.c b/config/config.c
index 919c1eec..28436d93 100644
--- a/config/config.c
+++ b/config/config.c
@@ -11,8 +11,9 @@
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
+#define nmhetcdir(file) NMHETCDIR#file
+#define nmhdocdir(file) NMHDOCDIR#file
 
 
 /*
@@ -144,8 +145,9 @@ char *nmhaccessftp = "nmh-access-ftp";
 char *nmhaccessurl = "nmh-access-url";
 
 char *mhbindir = NMHBINDIR;
-char *mhetcdir = NMHETCDIR;
 char *mhlibexecdir = NMHLIBEXECDIR;
+char *mhetcdir = NMHETCDIR;
+char *mhdocdir = NMHDOCDIR;
 
 /* 
  * nmh not-so constants
diff --git a/configure.ac b/configure.ac
index 4bdf12d6..a2f0c5ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,9 +550,10 @@ dnl We only use the expanded versions to print the install paths in
 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 "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
+eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
+eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";
 
 AC_MSG_NOTICE([
@@ -569,6 +570,7 @@ binary install path        : ${nmhbin}
 libexec install path       : ${nmhlibexec}/nmh
 config files install path  : ${nmhsysconf}/nmh
 man page install path      : ${nmhman}
+docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
diff --git a/man/mhparam.man b/man/mhparam.man
index 3df2a9ed..9719d7b9 100644
--- a/man/mhparam.man
+++ b/man/mhparam.man
@@ -1,4 +1,4 @@
-.TH MHPARAM %manext1% "March 16, 2014" "%nmhversion%"
+.TH MHPARAM %manext1% "May 21, 2016" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -49,9 +49,10 @@ can provide other information, such as the
 .B nmh
 version identifier, the locations of the nmh
 .IR bindir ,
-.I etcdir
+.IR libexecdir ,
+.IR etcdir ,
 and
-.I libexecdir
+.I docdir
 install directories, all
 .I proc
 settings, and the
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4fe8c8d3..22453467 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -30,8 +30,9 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 extern char *mhbindir;
-extern char *mhetcdir;
 extern char *mhlibexecdir;
+extern char *mhetcdir;
+extern char *mhdocdir;
 
 static char *sbackup = BACKUP_PREFIX;
 
@@ -106,9 +107,10 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },
      { "libexecdir",       &mhlibexecdir },
+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },
      { "localmbox",	   &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
-- 
2.56.0