36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From e65245488a46e000c38d2b926b66f6157c1c5a70 Mon Sep 17 00:00:00 2001
|
||
|
|
From: huyan <hu.huyan@huawei.com>
|
||
|
|
Date: Sat, 16 Mar 2019 16:32:32 +0800
|
||
|
|
Subject: [PATCH] backport honour --with-pluginpath for instalation
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 1 +
|
||
|
|
support/nfsidmap/Makefile.am | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 3de0ed4..06122ad 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 8b5dfe4..cdbeb4c 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
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|