From f674b209ffe37e92aa306722e38bdb254a061ffa Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 24 Apr 2023 14:25:09 +0200 Subject: [PATCH] [pkg-config] unify libdir --- rdtk/templates/rdtk.pc.in | 2 +- server/freerdp-server.pc.in | 2 +- server/proxy/freerdp-proxy.pc.in | 2 +- server/shadow/freerdp-shadow.pc.in | 2 +- uwac/templates/uwac.pc.in | 2 +- winpr/tools/winpr-tools.pc.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rdtk/templates/rdtk.pc.in b/rdtk/templates/rdtk.pc.in index 86bc1c9e2..cb5799965 100644 --- a/rdtk/templates/rdtk.pc.in +++ b/rdtk/templates/rdtk.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@RDTK_INCLUDE_DIR@ libs=-lrdtk@RDTK_VERSION_MAJOR@ diff --git a/server/freerdp-server.pc.in b/server/freerdp-server.pc.in index 8d5fb4dbf..795cc30bb 100644 --- a/server/freerdp-server.pc.in +++ b/server/freerdp-server.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@FREERDP_INCLUDE_DIR@ libs=-lfreerdp-server@FREERDP_API_VERSION@ diff --git a/server/proxy/freerdp-proxy.pc.in b/server/proxy/freerdp-proxy.pc.in index 235ca6726..41c76eda1 100644 --- a/server/proxy/freerdp-proxy.pc.in +++ b/server/proxy/freerdp-proxy.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@FREERDP_INCLUDE_DIR@ libs=-lfreerdp-server-proxy@FREERDP_API_VERSION@ diff --git a/server/shadow/freerdp-shadow.pc.in b/server/shadow/freerdp-shadow.pc.in index 615ae7f6b..5ef85649e 100644 --- a/server/shadow/freerdp-shadow.pc.in +++ b/server/shadow/freerdp-shadow.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@FREERDP_INCLUDE_DIR@ libs=-lfreerdp-shadow@FREERDP_API_VERSION@ -lfreerdp-shadow-subsystem@FREERDP_API_VERSION@ diff --git a/uwac/templates/uwac.pc.in b/uwac/templates/uwac.pc.in index 499d98335..b1a965c1b 100644 --- a/uwac/templates/uwac.pc.in +++ b/uwac/templates/uwac.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@UWAC_INCLUDE_DIR@ libs=-luwac@UWAC_VERSION_MAJOR@ diff --git a/winpr/tools/winpr-tools.pc.in b/winpr/tools/winpr-tools.pc.in index f406e9844..06c456b26 100644 --- a/winpr/tools/winpr-tools.pc.in +++ b/winpr/tools/winpr-tools.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@WINPR_INCLUDE_DIR@ libs=-lwinpr-tools@WINPR_TOOLS_API_VERSION@