From 699515158062a95d2bbee246e5a19e06d4e3c2bd Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Mon, 10 Oct 2022 00:07:03 +0900 Subject: [PATCH] fix pkgconfig files having bad includedir/libdir variables The pkgconfig files are installed in $PREFIX/lib so using libdir=${prefix}/lib/carla is confusing. Most software pkgconfig files seem to match the includedir and libdir variables with the actual includedir and libdir during configuration. --- data/pkgconfig/carla-host-plugin.pc | 9 +++++---- data/pkgconfig/carla-native-plugin.pc | 8 ++++---- data/pkgconfig/carla-standalone.pc | 8 ++++---- data/pkgconfig/carla-utils.pc | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/data/pkgconfig/carla-host-plugin.pc b/data/pkgconfig/carla-host-plugin.pc index 2cb307d03..29b952af9 100644 --- a/data/pkgconfig/carla-host-plugin.pc +++ b/data/pkgconfig/carla-host-plugin.pc @@ -1,9 +1,10 @@ prefix=X-PREFIX-X -libdir=X-LIBDIR-X/carla -includedir=X-INCLUDEDIR-X/carla +libdir=X-LIBDIR-X +includedir=X-INCLUDEDIR-X +carla_libdir=${libdir}/carla Name: carla-host-plugin Version: X-VERSION-X Description: Carla Host as Native Plugin -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_host-plugin -Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes +Libs: -Wl,-rpath,${carla_libdir} -L${carla_libdir} -lcarla_host-plugin +Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-native-plugin.pc b/data/pkgconfig/carla-native-plugin.pc index 0c83d7783..ade995015 100644 --- a/data/pkgconfig/carla-native-plugin.pc +++ b/data/pkgconfig/carla-native-plugin.pc @@ -1,9 +1,9 @@ prefix=X-PREFIX-X -libdir=X-LIBDIR-X/carla -includedir=X-INCLUDEDIR-X/carla +libdir=X-LIBDIR-X +includedir=X-INCLUDEDIR-X Name: carla-native-plugin Version: X-VERSION-X Description: Carla Native Plugin -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_native-plugin -Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes +Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_native-plugin +Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-standalone.pc b/data/pkgconfig/carla-standalone.pc index 567dc697f..0e1113a2e 100644 --- a/data/pkgconfig/carla-standalone.pc +++ b/data/pkgconfig/carla-standalone.pc @@ -1,9 +1,9 @@ prefix=X-PREFIX-X -libdir=X-LIBDIR-X/carla -includedir=X-INCLUDEDIR-X/carla +libdir=X-LIBDIR-X +includedir=X-INCLUDEDIR-X Name: carla-standalone Version: X-VERSION-X Description: Carla Host Standalone -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_standalone2 -Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes +Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_standalone2 +Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-utils.pc b/data/pkgconfig/carla-utils.pc index 6c30941aa..1115fbe62 100644 --- a/data/pkgconfig/carla-utils.pc +++ b/data/pkgconfig/carla-utils.pc @@ -1,9 +1,9 @@ prefix=X-PREFIX-X -libdir=X-LIBDIR-X/carla -includedir=X-INCLUDEDIR-X/carla +libdir=X-LIBDIR-X +includedir=X-INCLUDEDIR-X Name: carla-utils Version: X-VERSION-X Description: Carla Host Utilities -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_utils -Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes -I${includedir}/utils +Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_utils +Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes -I${includedir}/carla/utils