45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
From b34fcff0f8bccd7b827686b50c53f45b7e20bb44 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
||
|
|
Date: Tue, 12 Jun 2018 19:07:52 +0200
|
||
|
|
Subject: [PATCH] intg: Do not hardcode nsslibdir
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This change is needed in order to have make intgcheck-run properly
|
||
|
|
running on opensuse systems.
|
||
|
|
|
||
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
||
|
|
Reviewed-by: Chris Kowalczyk <ckowalczyk@suse.com>
|
||
|
|
Reviewed-by: Michal Židek <mzidek@redhat.com>
|
||
|
|
---
|
||
|
|
src/tests/intg/Makefile.am | 1 +
|
||
|
|
src/tests/intg/config.py.m4 | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/tests/intg/Makefile.am b/src/tests/intg/Makefile.am
|
||
|
|
index 9c5338261..4bd427669 100644
|
||
|
|
--- a/src/tests/intg/Makefile.am
|
||
|
|
+++ b/src/tests/intg/Makefile.am
|
||
|
|
@@ -73,6 +73,7 @@ cwrap-dbus-system.conf: data/cwrap-dbus-system.conf.in Makefile
|
||
|
|
config.py: config.py.m4
|
||
|
|
m4 -D "prefix=\`$(prefix)'" \
|
||
|
|
-D "sysconfdir=\`$(sysconfdir)'" \
|
||
|
|
+ -D "nsslibdir=\`$(nsslibdir)'" \
|
||
|
|
-D "dbpath=\`$(dbpath)'" \
|
||
|
|
-D "pidpath=\`$(pidpath)'" \
|
||
|
|
-D "logpath=\`$(logpath)'" \
|
||
|
|
diff --git a/src/tests/intg/config.py.m4 b/src/tests/intg/config.py.m4
|
||
|
|
index 6e011b692..04f78d869 100644
|
||
|
|
--- a/src/tests/intg/config.py.m4
|
||
|
|
+++ b/src/tests/intg/config.py.m4
|
||
|
|
@@ -4,7 +4,7 @@ Build configuration variables.
|
||
|
|
|
||
|
|
PREFIX = "prefix"
|
||
|
|
SYSCONFDIR = "sysconfdir"
|
||
|
|
-NSS_MODULE_DIR = PREFIX + "/lib"
|
||
|
|
+NSS_MODULE_DIR = "nsslibdir"
|
||
|
|
SSSDCONFDIR = SYSCONFDIR + "/sssd"
|
||
|
|
CONF_PATH = SSSDCONFDIR + "/sssd.conf"
|
||
|
|
DB_PATH = "dbpath"
|