blob: a3a80e9f76f52e2846ff901313b13cda8d712dc4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Fix pkgconfig libdir paths.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,7 +336,7 @@
set(VERSION "${PROJECT_VERSION}")
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
+set(libdir "${LIB_INSTALL_DIR}")
set(includedir "\${prefix}/include")
set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
--- a/libical.pc.in
+++ b/libical.pc.in
@@ -8,7 +8,7 @@
Name: libical
Description: An implementation of basic iCAL protocols
Version: @LIBICAL_LIB_VERSION_STRING@
-Libs: -L${libdir} -lical -licalss -licalvcal
+Libs: -lical -licalss -licalvcal
Libs.private: @PTHREAD_LIBS@
@REQUIRES_PRIVATE_ICU@
Cflags: -I${includedir}
--- a/src/libical-glib/CMakeLists.txt
+++ b/src/libical-glib/CMakeLists.txt
@@ -233,7 +233,7 @@
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib")
+set(libdir "${LIB_INSTALL_DIR}")
set(includedir "\${prefix}/include")
configure_file(
--- a/src/libical-glib/libical-glib.pc.in
+++ b/src/libical-glib/libical-glib.pc.in
@@ -8,4 +8,4 @@
Version: @LIBICAL_LIB_VERSION_STRING@
Requires: glib-2.0, gobject-2.0, libical
Cflags: -I${includedir}
-Libs: -L${libdir} -lical-glib
+Libs: -lical-glib
|
GitWeb
