From 4fb33f8c3754424ed325c1eb6806d8ae65c3b5a4 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 26 Jul 2015 20:37:06 +0200
Subject: [PATCH] Adjust LIBDIR and INCLUDEDIR in pkg-config files Really fixes
 #284

---
 Makefile                 | 9 +++++++++
 data/carla-standalone.pc | 5 ++---
 data/carla-utils.pc      | 5 ++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2c157ae97..ef4677058 100644
--- a/Makefile
+++ b/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
diff --git a/data/carla-standalone.pc b/data/carla-standalone.pc
index 6e1ae6060..fb2239003 100644
--- a/data/carla-standalone.pc
+++ b/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
diff --git a/data/carla-utils.pc b/data/carla-utils.pc
index 051980335..0d5acdd78 100644
--- a/data/carla-utils.pc
+++ b/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