diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-07-21 16:51:34 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-07-21 16:51:53 +0200 |
| commit | 3bb86b72ca5882b1e5684db837c75df810f283c3 (patch) | |
| tree | d7fbcfea44a9b44bd1e147453928395b0028f272 | |
| parent | 4a3a1e0b8ad676f057e4fb141b4692987e8ce558 (diff) | |
Expand the various pkcs11 config paths properly.
* Without this the ${prefix} part of the variable wasn't being
expanded and was making it into the #define.
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1c64fa8..5548117 100644 --- a/configure.ac +++ b/configure.ac @@ -46,8 +46,9 @@ AC_ARG_WITH([pkcs11-dir], [pkcs11_dir=$withval], [pkcs11_dir=$sysconfdir/pkcs11]) -p11_system_conf="$pkcs11_dir/pkcs11.conf" -p11_system_modules="$pkcs11_dir/modules" +# We expand these so we have concrete paths +p11_system_conf=$(eval echo $pkcs11_dir/pkcs11.conf) +p11_system_modules=$(eval echo $pkcs11_dir/modules) p11_user_conf="~/.pkcs11/pkcs11.conf" p11_user_modules="~/.pkcs11/modules" |