Change around installation of headers, pkg-config, and file names

 * Install headers to ${prefix}/include/p11-kit-1/p11-kit/
 * This solves problems with other projects that have their own
   pkcs11.h files.
 * Change the pkg-config file name to p11-kit-1.pc
 * Change the source file names.

2 files changed, 83 insertions, 83 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b42302..3e15306 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,2 @@
 # List of source files which contain translatable strings.
-module/p11-kit-messages.c
\ No newline at end of file
+p11-kit/messages.c
diff --git a/po/p11-kit.pot b/po/p11-kit.pot
index 066f91c..3e5c888 100644
--- a/po/p11-kit.pot
+++ b/po/p11-kit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: p11-kit 0.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.example.com\n"
-"POT-Creation-Date: 2011-02-18 10:47+0100\n"
+"POT-Creation-Date: 2011-05-27 14:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,326 +17,326 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: module/p11-kit-messages.c:70
+#: p11-kit/messages.c:78
 msgid "The operation was cancelled"
 msgstr ""
 
-#: module/p11-kit-messages.c:73
+#: p11-kit/messages.c:81
 msgid "Insufficient memory available"
 msgstr ""
 
-#: module/p11-kit-messages.c:75
+#: p11-kit/messages.c:83
 msgid "The specified slot ID is not valid"
 msgstr ""
 
-#: module/p11-kit-messages.c:77
+#: p11-kit/messages.c:85
 msgid "Internal error"
 msgstr ""
 
-#: module/p11-kit-messages.c:79
+#: p11-kit/messages.c:87
 msgid "The operation failed"
 msgstr ""
 
-#: module/p11-kit-messages.c:81
+#: p11-kit/messages.c:89
 msgid "Invalid arguments"
 msgstr ""
 
-#: module/p11-kit-messages.c:83
+#: p11-kit/messages.c:91
 msgid "The module cannot create needed threads"
 msgstr ""
 
-#: module/p11-kit-messages.c:85
+#: p11-kit/messages.c:93
 msgid "The module cannot lock data properly"
 msgstr ""
 
-#: module/p11-kit-messages.c:87
+#: p11-kit/messages.c:95
 msgid "The field is read-only"
 msgstr ""
 
-#: module/p11-kit-messages.c:89
+#: p11-kit/messages.c:97
 msgid "The field is sensitive and cannot be revealed"
 msgstr ""
 
-#: module/p11-kit-messages.c:91
+#: p11-kit/messages.c:99
 msgid "The field is invalid or does not exist"
 msgstr ""
 
-#: module/p11-kit-messages.c:93
+#: p11-kit/messages.c:101
 msgid "Invalid value for field"
 msgstr ""
 
-#: module/p11-kit-messages.c:95
+#: p11-kit/messages.c:103
 msgid "The data is not valid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:97
+#: p11-kit/messages.c:105
 msgid "The data is too long"
 msgstr ""
 
-#: module/p11-kit-messages.c:99
+#: p11-kit/messages.c:107
 msgid "An error occurred on the device"
 msgstr ""
 
-#: module/p11-kit-messages.c:101
+#: p11-kit/messages.c:109
 msgid "Insufficient memory available on the device"
 msgstr ""
 
-#: module/p11-kit-messages.c:103
+#: p11-kit/messages.c:111
 msgid "The device was removed or unplugged"
 msgstr ""
 
-#: module/p11-kit-messages.c:105
+#: p11-kit/messages.c:113
 msgid "The encrypted data is not valid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:107
+#: p11-kit/messages.c:115
 msgid "The encrypted data is too long"
 msgstr ""
 
-#: module/p11-kit-messages.c:109
+#: p11-kit/messages.c:117
 msgid "This operation is not supported"
 msgstr ""
 
-#: module/p11-kit-messages.c:111
+#: p11-kit/messages.c:119
 msgid "The key is missing or invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:113
+#: p11-kit/messages.c:121
 msgid "The key is the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:115
+#: p11-kit/messages.c:123
 msgid "The key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:117
+#: p11-kit/messages.c:125
 msgid "No key is needed"
 msgstr ""
 
-#: module/p11-kit-messages.c:119
+#: p11-kit/messages.c:127
 msgid "The key is different than before"
 msgstr ""
 
-#: module/p11-kit-messages.c:121
+#: p11-kit/messages.c:129
 msgid "A key is needed"
 msgstr ""
 
-#: module/p11-kit-messages.c:123
+#: p11-kit/messages.c:131
 msgid "Cannot include the key in the digest"
 msgstr ""
 
-#: module/p11-kit-messages.c:125
+#: p11-kit/messages.c:133
 msgid "This operation cannot be done with this key"
 msgstr ""
 
-#: module/p11-kit-messages.c:127
+#: p11-kit/messages.c:135
 msgid "The key cannot be wrapped"
 msgstr ""
 
-#: module/p11-kit-messages.c:129
+#: p11-kit/messages.c:137
 msgid "Cannot export this key"
 msgstr ""
 
-#: module/p11-kit-messages.c:131
+#: p11-kit/messages.c:139
 msgid "The crypto mechanism is invalid or unrecognized"
 msgstr ""
 
-#: module/p11-kit-messages.c:133
+#: p11-kit/messages.c:141
 msgid "The crypto mechanism has an invalid argument"
 msgstr ""
 
-#: module/p11-kit-messages.c:135
+#: p11-kit/messages.c:143
 msgid "The object is missing or invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:137
+#: p11-kit/messages.c:145
 msgid "Another operation is already taking place"
 msgstr ""
 
-#: module/p11-kit-messages.c:139
+#: p11-kit/messages.c:147
 msgid "No operation is taking place"
 msgstr ""
 
-#: module/p11-kit-messages.c:141
+#: p11-kit/messages.c:149
 msgid "The password or PIN is incorrect"
 msgstr ""
 
-#: module/p11-kit-messages.c:143
+#: p11-kit/messages.c:151
 msgid "The password or PIN is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:145
+#: p11-kit/messages.c:153
 msgid "The password or PIN is of an invalid length"
 msgstr ""
 
-#: module/p11-kit-messages.c:147
+#: p11-kit/messages.c:155
 msgid "The password or PIN has expired"
 msgstr ""
 
-#: module/p11-kit-messages.c:149
+#: p11-kit/messages.c:157
 msgid "The password or PIN is locked"
 msgstr ""
 
-#: module/p11-kit-messages.c:151
+#: p11-kit/messages.c:159
 msgid "The session is closed"
 msgstr ""
 
-#: module/p11-kit-messages.c:153
+#: p11-kit/messages.c:161
 msgid "Too many sessions are active"
 msgstr ""
 
-#: module/p11-kit-messages.c:155
+#: p11-kit/messages.c:163
 msgid "The session is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:157
+#: p11-kit/messages.c:165
 msgid "The session is read-only"
 msgstr ""
 
-#: module/p11-kit-messages.c:159
+#: p11-kit/messages.c:167
 msgid "An open session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:161
+#: p11-kit/messages.c:169
 msgid "A read-only session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:163
+#: p11-kit/messages.c:171
 msgid "An administrator session exists"
 msgstr ""
 
-#: module/p11-kit-messages.c:165
+#: p11-kit/messages.c:173
 msgid "The signature is bad or corrupted"
 msgstr ""
 
-#: module/p11-kit-messages.c:167
+#: p11-kit/messages.c:175
 msgid "The signature is unrecognized or corrupted"
 msgstr ""
 
-#: module/p11-kit-messages.c:169
+#: p11-kit/messages.c:177
 msgid "Certain required fields are missing"
 msgstr ""
 
-#: module/p11-kit-messages.c:171
+#: p11-kit/messages.c:179
 msgid "Certain fields have invalid values"
 msgstr ""
 
-#: module/p11-kit-messages.c:173
+#: p11-kit/messages.c:181
 msgid "The device is not present or unplugged"
 msgstr ""
 
-#: module/p11-kit-messages.c:175
+#: p11-kit/messages.c:183
 msgid "The device is invalid or unrecognizable"
 msgstr ""
 
-#: module/p11-kit-messages.c:177
+#: p11-kit/messages.c:185
 msgid "The device is write protected"
 msgstr ""
 
-#: module/p11-kit-messages.c:179
+#: p11-kit/messages.c:187
 msgid "Cannot import because the key is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:181
+#: p11-kit/messages.c:189
 msgid "Cannot import because the key is of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:183
+#: p11-kit/messages.c:191
 msgid "Cannot import because the key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:185
+#: p11-kit/messages.c:193
 msgid "You are already logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:187
+#: p11-kit/messages.c:195
 msgid "No user has logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:189
+#: p11-kit/messages.c:197
 msgid "The user's password or PIN is not set"
 msgstr ""
 
-#: module/p11-kit-messages.c:191
+#: p11-kit/messages.c:199
 msgid "The user is of an invalid type"
 msgstr ""
 
-#: module/p11-kit-messages.c:193
+#: p11-kit/messages.c:201
 msgid "Another user is already logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:195
+#: p11-kit/messages.c:203
 msgid "Too many users of different types are logged in"
 msgstr ""
 
-#: module/p11-kit-messages.c:197
+#: p11-kit/messages.c:205
 msgid "Cannot import an invalid key"
 msgstr ""
 
-#: module/p11-kit-messages.c:199
+#: p11-kit/messages.c:207
 msgid "Cannot import a key of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:201
+#: p11-kit/messages.c:209
 msgid "Cannot export because the key is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:203
+#: p11-kit/messages.c:211
 msgid "Cannot export because the key is of the wrong size"
 msgstr ""
 
-#: module/p11-kit-messages.c:205
+#: p11-kit/messages.c:213
 msgid "Cannot export because the key is of the wrong type"
 msgstr ""
 
-#: module/p11-kit-messages.c:207
+#: p11-kit/messages.c:215
 msgid "Unable to initialize the random number generator"
 msgstr ""
 
-#: module/p11-kit-messages.c:209
+#: p11-kit/messages.c:217
 msgid "No random number generator available"
 msgstr ""
 
-#: module/p11-kit-messages.c:211
+#: p11-kit/messages.c:219
 msgid "The crypto mechanism has an invalid parameter"
 msgstr ""
 
-#: module/p11-kit-messages.c:213
+#: p11-kit/messages.c:221
 msgid "Not enough space to store the result"
 msgstr ""
 
-#: module/p11-kit-messages.c:215
+#: p11-kit/messages.c:223
 msgid "The saved state is invalid"
 msgstr ""
 
-#: module/p11-kit-messages.c:217
+#: p11-kit/messages.c:225
 msgid "The information is sensitive and cannot be revealed"
 msgstr ""
 
-#: module/p11-kit-messages.c:219
+#: p11-kit/messages.c:227
 msgid "The state cannot be saved"
 msgstr ""
 
-#: module/p11-kit-messages.c:221
+#: p11-kit/messages.c:229
 msgid "The module has not been initialized"
 msgstr ""
 
-#: module/p11-kit-messages.c:223
+#: p11-kit/messages.c:231
 msgid "The module has already been initialized"
 msgstr ""
 
-#: module/p11-kit-messages.c:225
+#: p11-kit/messages.c:233
 msgid "Cannot lock data"
 msgstr ""
 
-#: module/p11-kit-messages.c:227
+#: p11-kit/messages.c:235
 msgid "The data cannot be locked"
 msgstr ""
 
-#: module/p11-kit-messages.c:229
+#: p11-kit/messages.c:237
 msgid "The signature request was rejected by the user"
 msgstr ""
 
-#: module/p11-kit-messages.c:232
+#: p11-kit/messages.c:240
 msgid "Unknown error"
 msgstr ""