diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-08-01 13:18:05 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-08-01 13:18:05 +0200 |
| commit | e938d137fee800605b5c11d0c2aa6eae90e205eb (patch) | |
| tree | 9200d125e8f54e8f6a64b49a17aa5fdfdf8a9a4e /p11-kit | |
| parent | dd6b2c11794a74a33bfa53fec9892cb0c7007e80 (diff) | |
Add example configuration documentation.
* And also install example pkcs11.conf file.
Diffstat (limited to 'p11-kit')
| -rw-r--r-- | p11-kit/Makefile.am | 6 | ||||
| -rw-r--r-- | p11-kit/pkcs11.conf.example.in | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index da06ebd..9d28b5e 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -46,8 +46,12 @@ libp11_kit_testable_la_SOURCES = $(MODULE_SRCS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = p11-kit-1.pc +exampledir = $(p11_system_dir) +example_DATA = pkcs11.conf.example + EXTRA_DIST = \ - p11-kit-1.pc.in + p11-kit-1.pc.in \ + pkcs11.conf.example.in # Proxy module is actually same as library, so install a link install-exec-hook: diff --git a/p11-kit/pkcs11.conf.example.in b/p11-kit/pkcs11.conf.example.in new file mode 100644 index 0000000..bfc2cb3 --- /dev/null +++ b/p11-kit/pkcs11.conf.example.in @@ -0,0 +1,9 @@ +# This is an example @p11_system_conf@ file. Copy it into +# place before use. + +# This setting controls whether to load user configuration from the +# ~/.pkcs11 directory. Possible values: +# none: No user configuration (default) +# merge: Merge the user configuration over the system configuration +# only: Only user configuration, ignore system configuration +user-config: merge |