Added docdir to mhparam.

(cherry picked from commit 89d69fbd2ae1f9c8c989850ec7057814c655a727)

diff --git a/Makefile.am b/Makefile.am
index 91e4d93e5e9603787f99b562b2b661de7f45bfc4..80e9cc7c4f530269206b9ac7408ef756fd59e2a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -631,10 +631,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
 
 
 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)"' \
                -DMAILSPOOL='"$(mailspool)"' \

-               -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-               -DNMHLIBEXECDIR='"$(nmhlibexecdir)"'
+               -DSENDMAILPATH='"$(sendmailpath)"'

 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 

diff --git a/config/config.c b/config/config.c
index 919c1eecf31ff2e5df28261a576d5a53b8a63ce2..28436d93a8ab0fa64be6d362ab5e60393803dfd4 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -11,8 +11,9 @@
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file

-#define nmhetcdir(file) NMHETCDIR#file

 #define nmhlibexecdir(file) NMHLIBEXECDIR#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 *nmhaccessurl = "nmh-access-url";
 
 char *mhbindir = NMHBINDIR;

-char *mhetcdir = NMHETCDIR;

 char *mhlibexecdir = NMHLIBEXECDIR;
 char *mhlibexecdir = NMHLIBEXECDIR;

+char *mhetcdir = NMHETCDIR;
+char *mhdocdir = NMHDOCDIR;

 
 /* 
  * nmh not-so constants
 
 /* 
  * nmh not-so constants

diff --git a/configure.ac b/configure.ac
index 8f731557b26dc58bc7fbdad36879e3756c448184..94b2ec03073f9abaf65baa3614a38f558fc8e6c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -597,9 +597,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}"
 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 "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"

+eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"

 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"

+eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"

 eval "nmhrpm=${nmhrpm}";
 
 AC_MSG_NOTICE([
 eval "nmhrpm=${nmhrpm}";
 
 AC_MSG_NOTICE([


@@ -616,6 +617,7 @@ binary install path        : ${nmhbin}
 libexec install path       : ${nmhlibexec}/nmh
 config files install path  : ${nmhsysconf}/nmh
 man page install path      : ${nmhman}
 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}
 RPM build root             : ${nmhrpm}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}

diff --git a/man/mhparam.man b/man/mhparam.man
index 3df2a9eda8128cac2d4f4ca4c4d7b9678dc6dc91..9719d7b9901bfc308a4da7b50b10bbb8c3ab3d15 100644 (file)
--- 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%
 .\"
 .\"
 .\" %nmhwarning%
 .\"


@@ -49,9 +49,10 @@ can provide other information, such as the
 .B nmh
 version identifier, the locations of the nmh
 .IR bindir ,
 .B nmh
 version identifier, the locations of the nmh
 .IR bindir ,

-.I etcdir
+.IR libexecdir ,
+.IR etcdir ,

 and
 and

-.I libexecdir
+.I docdir

 install directories, all
 .I proc
 settings, and the
 install directories, all
 .I proc
 settings, and the

diff --git a/uip/mhparam.c b/uip/mhparam.c
index f6daf9a53c28d80adc9e9b8e2e3bf2f74c40f11c..9b5fa069634f873b28614f6dd71ec1e2a9c9a9ad 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -30,8 +30,9 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 extern char *mhbindir;
 #undef X
 
 extern char *mhbindir;

-extern char *mhetcdir;

 extern char *mhlibexecdir;
 extern char *mhlibexecdir;

+extern char *mhetcdir;
+extern char *mhdocdir;

 
 static char *sbackup = BACKUP_PREFIX;
 
 
 static char *sbackup = BACKUP_PREFIX;
 


@@ -113,9 +114,10 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },

-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },

      { "libexecdir",       &mhlibexecdir },
      { "libexecdir",       &mhlibexecdir },

+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },

      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },