Skip to content

Commit e9e01fa

Browse files
authored
Merge pull request zeromq#4360 from darkdragon-001/fix-pkgconfig
Fix pkgconfig
2 parents f13f891 + 58c2ac1 commit e9e01fa

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1227,8 +1227,8 @@ list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
12271227

12281228
set(prefix ${CMAKE_INSTALL_PREFIX})
12291229
set(exec_prefix ${prefix})
1230-
set(libdir ${prefix}/lib)
1231-
set(includedir ${prefix}/include)
1230+
set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR})
1231+
set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
12321232
set(VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH})
12331233
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libzmq.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc @ONLY)
12341234
set(zmq-pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc)

RELICENSE/darkdragon-001.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
2+
3+
This is a statement by Darkdragon-001
4+
that grants permission to relicense its copyrights in the libzmq C++
5+
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
6+
Open Source Initiative approved license chosen by the current ZeroMQ
7+
BDFL (Benevolent Dictator for Life).
8+
9+
A portion of the commits made by the Github handle "darkdragon-001", with
10+
commit author "Darkdragon-001", are copyright of Darkdragon-001.
11+
This document hereby grants the libzmq project team to relicense libzmq,
12+
including all past, present and future contributions of the author listed above.
13+
14+
Darkdragon-001
15+
2022/03/15

0 commit comments

Comments
 (0)