Add support for setting nmh directories.

Add new precious variables (nmhlibexecdir and nmhetcdir) that will
permit the user to specify these directories exactly.  They default to
$(libexecdir)/nmh and $(sysconfdir)/nmh, respectively.

diff --git a/Makefile.am b/Makefile.am
index 62938eb..587fe3f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,6 @@ LDADD = sbr/libmh.a
 MHNSEARCHPATH = "$(PATH)"
 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
-##
-## Install config files and back-end programs in our own subdirecctories.
-##
-nmhetcdir  = @sysconfdir@/nmh
-nmhlibexecdir = @libexecdir@/nmh
-
 ##
 ## nmh _does_ have a test suite!
 ##

diff --git a/configure.ac b/configure.ac
index eb94a5f..1f8dc6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([-Wall foreign serial-tests subdir-objects 1.12])
 AC_CANONICAL_HOST
 
 AC_MSG_NOTICE([configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION])
-AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
+AC_SUBST([VERSION], [AC_PACKAGE_VERSION])dnl
 
 dnl What date of nmh are we building?
 DATE=`cat ${srcdir}/DATE`
@@ -558,6 +558,20 @@ AS_IF([test "$LEX" = flex],
                 s/int n; \\/yy_size_t n; \\/'\'' $@ >$@.tmp && mv -f $@.tmp $@;'])
        AC_SUBST([AM_LFLAGS])])
 
+dnl ------------------
+dnl By default we put backend executables in $(libexecdir)/nmh and
+dnl configuration files in $(sysconfdir)/nmh, but let a user override
+dnl these choices by supplying these variables
+dnl ------------------
+
+AC_ARG_VAR([nmhlibexecdir], [The installation directory for backend programs
+used by nmh.  Defaults to $(libexecdir)/nmh.])
+AS_IF([test -z ${nmhlibexecdir+x}], [nmhlibexecdir='${libexecdir}/nmh'])
+
+AC_ARG_VAR([nmhetcdir], [The installation directory for configuration files
+used by nmh.  Defaults to $(sysconfdir)/nmh.])
+AS_IF([test -z ${nmhetcdir+x}], [nmhetcdir='${sysconfdir}/nmh'])
+
 dnl ------------------
 dnl FOR INTERNAL USE by the NMH test suite
 dnl ------------------
@@ -601,8 +615,9 @@ 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 "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
+eval "nmhlibexec=${nmhlibexecdir}"; eval "nmhlibexec=${nmhlibexec}"
+eval "nmhlibexec=${nmhlibexec}"
+eval "nmhsysconf=${nmhetcdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";
@@ -618,8 +633,8 @@ linker flags               : ${AM_LDFLAGS} ${LDFLAGS}
 preprocessor flags         : ${AM_CPPFLAGS} ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}
-libexec install path       : ${nmhlibexec}/nmh
-config files install path  : ${nmhsysconf}/nmh
+libexec install path       : ${nmhlibexec}
+config files install path  : ${nmhsysconf}
 man page install path      : ${nmhman}
 docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}