From a081b6652acc9d9a9af22a266f9175f689b8c5d1 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@collabora.co.uk>
Date: Mon, 19 Sep 2011 09:24:35 +0200
Subject: Expand the libdir path correctly

https://bugs.freedesktop.org/show_bug.cgi?id=40985
---
 p11-kit/Makefile.am | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'p11-kit')

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index dc9f8ab..26a03b1 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -1,7 +1,14 @@
+NULL =
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	-DP11_KIT_FUTURE_UNSTABLE_API
+	-DP11_KIT_FUTURE_UNSTABLE_API \
+	-DP11_SYSTEM_CONFIG_FILE=\""$(p11_system_config_file)"\" \
+	-DP11_SYSTEM_CONFIG_MODULES=\""$(p11_system_config_modules)"\" \
+	-DP11_USER_CONFIG_FILE=\""$(p11_user_config_file)"\" \
+	-DP11_USER_CONFIG_MODULES=\""$p11_user_config_modules"\" \
+	-DP11_MODULE_PATH=\""$p11_module_path"\" \
+	$(NULL)
 
 incdir = $(includedir)/p11-kit-1/p11-kit
 
-- 
cgit v1.1