diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-09-19 09:24:35 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-09-19 09:24:35 +0200 |
| commit | a081b6652acc9d9a9af22a266f9175f689b8c5d1 (patch) | |
| tree | 51f7d06580542d901800a6e5eefa691f7c5d631c | |
| parent | 8054865325fdb2221f3e425d04d9e03f6475553e (diff) | |
| download | p11-kit-a081b6652acc9d9a9af22a266f9175f689b8c5d1.tar.gz | |
Expand the libdir path correctly
https://bugs.freedesktop.org/show_bug.cgi?id=40985
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | p11-kit/Makefile.am | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 50f323c..f5c1e04 100644 --- a/configure.ac +++ b/configure.ac @@ -73,12 +73,6 @@ p11_user_config_file="$p11_user_config/pkcs11.conf" p11_user_config_modules="$p11_user_config/modules" p11_module_path="$module_path" -AC_DEFINE_UNQUOTED(P11_SYSTEM_CONFIG_FILE, "$p11_system_config_file", [System configuration file]) -AC_DEFINE_UNQUOTED(P11_SYSTEM_CONFIG_MODULES, "$p11_system_config_modules", [System modules configuration dir]) -AC_DEFINE_UNQUOTED(P11_USER_CONFIG_FILE, "$p11_user_config_file", [User configuration file]) -AC_DEFINE_UNQUOTED(P11_USER_CONFIG_MODULES, "$p11_user_config_modules", [User modules configuration dir]) -AC_DEFINE_UNQUOTED(P11_MODULE_PATH, "$p11_module_path", [Path to load modules with relative path names from]) - AC_SUBST(p11_system_config) AC_SUBST(p11_system_config_file) AC_SUBST(p11_system_config_modules) 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 |