Adjust LIBDIR and INCLUDEDIR in pkg-config files

Really fixes #284

Makefile

@@ -644,6 +644,15 @@ endif
 		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \
 		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc
 
+	# Adjust LIBDIR and INCLUDEDIR in pkg-config files
+	sed -i 's?X-LIBDIR-X?$(LIBDIR)?' \
+		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \
+		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc
+
+	sed -i 's?X-INCLUDEDIR-X?$(INCLUDEDIR)?' \
+		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \
+		$(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc
+
 	# Adjust LIBDIR and DATADIR value in code
 	sed -i 's?X_LIBDIR_X = None?X_LIBDIR_X = "$(LIBDIR)"?' \
 		$(DESTDIR)$(DATADIR)/carla/carla_shared.py

data/carla-standalone.pc

@@ -1,7 +1,6 @@
 prefix=X-PREFIX-X
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/carla
-includedir=${prefix}/include/carla
+libdir=X-LIBDIR-X/carla
+includedir=X-INCLUDEDIR-X/carla
 
 Name: carla-standalone
 Version: 1.9.5

data/carla-utils.pc

@@ -1,7 +1,6 @@
 prefix=X-PREFIX-X
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/carla
-includedir=${prefix}/include/carla
+libdir=X-LIBDIR-X/carla
+includedir=X-INCLUDEDIR-X/carla
 
 Name: carla-utils
 Version: 1.9.5