2018-12-04 00:42:37

by NeilBrown

[permalink] [raw]
Subject: [PATCH nfs-utils] nfsidmap: honour --with-pluginpath for instalation.


The path set with --with-pluginpath is not currently
used when installing plugins. It should be.

Signed-off-by: NeilBrown <[email protected]>
---
configure.ac | 1 +
support/nfsidmap/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4163f6a518f5..4bf5aea4442f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,6 +450,7 @@ if test -n "$path_plugins" ; then
[Define this to change the plugins path])
fi
AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")
+AC_SUBST(PATH_PLUGINS, "$path_plugins")

AC_SUBST(AM_CPPFLAGS, "$AM_CPPFLAGS")
AC_DEFINE([HAVE_NFS4_SET_DEBUG], 1,
diff --git a/support/nfsidmap/Makefile.am b/support/nfsidmap/Makefile.am
index 8b5dfe4e784a..cdbeb4c1a9ac 100644
--- a/support/nfsidmap/Makefile.am
+++ b/support/nfsidmap/Makefile.am
@@ -1,4 +1,4 @@
-pkgplugindir=$(libdir)/libnfsidmap
+pkgplugindir=$(PATH_PLUGINS)

if ENABLE_LDAP
UMICH_LDAP_LIB = umich_ldap.la
--
2.14.0.rc0.dirty


Attachments:
signature.asc (832.00 B)

2018-12-10 21:25:52

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH nfs-utils] nfsidmap: honour --with-pluginpath for instalation.



On 12/3/18 7:42 PM, NeilBrown wrote:
>
> The path set with --with-pluginpath is not currently
> used when installing plugins. It should be.
>
> Signed-off-by: NeilBrown <[email protected]>
Committed...

steved.

> ---
> configure.ac | 1 +
> support/nfsidmap/Makefile.am | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 4163f6a518f5..4bf5aea4442f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -450,6 +450,7 @@ if test -n "$path_plugins" ; then
> [Define this to change the plugins path])
> fi
> AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")
> +AC_SUBST(PATH_PLUGINS, "$path_plugins")
>
> AC_SUBST(AM_CPPFLAGS, "$AM_CPPFLAGS")
> AC_DEFINE([HAVE_NFS4_SET_DEBUG], 1,
> diff --git a/support/nfsidmap/Makefile.am b/support/nfsidmap/Makefile.am
> index 8b5dfe4e784a..cdbeb4c1a9ac 100644
> --- a/support/nfsidmap/Makefile.am
> +++ b/support/nfsidmap/Makefile.am
> @@ -1,4 +1,4 @@
> -pkgplugindir=$(libdir)/libnfsidmap
> +pkgplugindir=$(PATH_PLUGINS)
>
> if ENABLE_LDAP
> UMICH_LDAP_LIB = umich_ldap.la
>