Skip to content

Commit bc8ea1e

Browse files
committed
Fix library filename
Signed-off-by: realmfoo <konstantin.leboev@gmail.com>
1 parent e4d9f0f commit bc8ea1e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ project(pkcs11-proxy C)
88
set(VERSION "0.1.6")
99

1010
set(CMAKE_C_STANDARD 99)
11-
set(PKCS11_PROXY_SRCS gck-rpc-module.c gck-rpc-message.c gck-rpc-util.c egg-buffer.c)
11+
set(PKCS11_LIB_SRCS gck-rpc-module.c gck-rpc-message.c gck-rpc-util.c egg-buffer.c)
1212
if (NOT WIN32)
1313
set(PKCS11_DAEMON_SRCS egg-buffer.c gck-rpc-daemon-standalone.c gck-rpc-dispatch.c gck-rpc-message.c gck-rpc-util.c)
1414
endif ()
1515

1616
add_definitions(-Wall)
17-
add_library(libpkcs11-proxy SHARED ${PKCS11_PROXY_SRCS})
18-
set_target_properties(libpkcs11-proxy PROPERTIES VERSION ${VERSION} SOVERSION 0)
17+
add_library(libpkcs11-proxy SHARED ${PKCS11_LIB_SRCS})
18+
set_target_properties(libpkcs11-proxy PROPERTIES VERSION ${VERSION} SOVERSION 0 PREFIX "")
1919

2020
# Disable console when building Win32 binary in release mode
2121
if (WIN32)
@@ -27,18 +27,18 @@ if (WIN32)
2727
endif ()
2828

2929
if (NOT WIN32)
30-
add_executable(pkcs11-daemon ${GUI_TYPE} ${PKCS11_DAEMON_SRCS})
30+
add_executable(pkcs11-proxy ${GUI_TYPE} ${PKCS11_DAEMON_SRCS})
3131
endif ()
3232

3333
if (WIN32)
3434
target_link_libraries(libpkcs11-proxy ws2_32)
3535
else ()
3636
target_link_libraries(libpkcs11-proxy pthread)
37-
target_link_libraries(pkcs11-daemon dl pthread)
37+
target_link_libraries(pkcs11-proxy dl pthread)
3838
install(TARGETS libpkcs11-proxy
3939
DESTINATION /usr/lib
4040
COMPONENT client)
41-
install(TARGETS pkcs11-daemon
41+
install(TARGETS pkcs11-proxy
4242
DESTINATION /usr/bin
4343
COMPONENT server)
4444

@@ -55,13 +55,13 @@ else ()
5555
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "PKCS#11 Proxy")
5656
set(CPACK_DEBIAN_PACKAGE_SECTION "universe/net")
5757

58-
set(CPACK_COMPONENT_CLIENT_DESCRIPTION "PKCS#11 proxy client library")
58+
set(CPACK_COMPONENT_CLIENT_DESCRIPTION "PKCS#11 proxy library")
5959
set(CPACK_DEBIAN_CLIENT_PACKAGE_NAME "libpkcs11-proxy")
6060
set(CPACK_DEBIAN_CLIENT_FILE_NAME "libpkcs11-proxy_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
6161

6262
set(CPACK_COMPONENT_SERVER_DESCRIPTION "PKCS#11 proxy server")
63-
set(CPACK_DEBIAN_SERVER_PACKAGE_NAME "pkcs11-proxy-server")
64-
set(CPACK_DEBIAN_SERVER_FILE_NAME "pkcs11-proxy-server_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
63+
set(CPACK_DEBIAN_SERVER_PACKAGE_NAME "pkcs11-proxy")
64+
set(CPACK_DEBIAN_SERVER_FILE_NAME "pkcs11-proxy_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
6565

6666
include(CPack)
6767
endif ()

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For demonstration purposes, however, security is not a consideration.
3232
Enter user PIN:
3333
The token has been initialized.
3434

35-
$ PKCS11_DAEMON_SOCKET="tcp://127.0.0.1:2345" pkcs11-daemon /usr/lib/libsofthsm.so
35+
$ PKCS11_DAEMON_SOCKET="tcp://127.0.0.1:2345" pkcs11-proxy /usr/lib/libsofthsm.so
3636
$ PKCS11_PROXY_SOCKET="tcp://127.0.0.1:2345" pkcs11-tool --module=/usr/lib/libpkcs11-proxy.so -L Available
3737
slots: Slot 0 SoftHSM
3838
token label: test token manuf: SoftHSM token model: SoftHSM

0 commit comments

Comments
 (0)