Skip to content

Commit c4af918

Browse files
committed
Try having relative paths in pkg-config file.
Addresses #248
1 parent a1a0263 commit c4af918

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,12 @@ endif()
281281

282282

283283
# pkgconfig file
284-
set(prefix ${CMAKE_INSTALL_PREFIX})
285-
set(exec_prefix \${prefix})
286-
SET(bindir ${CMAKE_INSTALL_FULL_BINDIR})
287-
SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
288-
SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
284+
file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
285+
set(bindir "\${prefix}/${pc_relative_bindir}")
286+
file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
287+
set(libdir "\${prefix)/${pc_relative_libdir}")
288+
file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
289+
set(includedir "\${prefix}/${pc_relative_includedir}")
289290
if(CMAKE_SYSTEM_NAME MATCHES BSD)
290291
set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
291292
endif(CMAKE_SYSTEM_NAME MATCHES BSD)

libzip.pc.in

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
prefix=@prefix@
2-
exec_prefix=@exec_prefix@
1+
prefix=@CMAKE_INSTALL_PREFIX@
2+
exec_prefix=${prefix}
33
bindir=@bindir@
44
libdir=@libdir@
55
includedir=@includedir@
66

7-
zipcmp=@bindir@/zipcmp
7+
zipcmp=${bindir}/zipcmp
88

99
Name: libzip
1010
Description: library for handling zip archives
1111
Version: @PROJECT_VERSION@
1212
Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip
1313
Libs.private: @LIBS@
1414
Cflags: -I${includedir}
15-

0 commit comments

Comments
 (0)