From e968656672bb16168aeaa32699260a2b23ec13b6 Mon Sep 17 00:00:00 2001
From: nirenjan <nirenjan@gmail.com>
Date: Tue, 3 Aug 2021 12:53:26 -0700
Subject: [PATCH] Fix Cflags and add libx52util.pc

---
 configure.ac                |  1 +
 libx52/libx52.pc.in         |  2 +-
 libx52io/libx52io.pc.in     |  2 +-
 libx52util/Makefile.am      |  3 +++
 libx52util/libx52util.pc.in | 10 ++++++++++
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 libx52util/libx52util.pc.in

diff --git a/configure.ac b/configure.ac
index ee4beac..2c5c170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,6 +118,7 @@ AC_CONFIG_FILES([ po/Makefile.in
     lib/Makefile
     libx52/libx52.pc
     libx52io/libx52io.pc
+    libx52util/libx52util.pc
     lib/pinelog/Makefile
     udev/60-saitek-x52-x52pro.rules
 ])
diff --git a/libx52/libx52.pc.in b/libx52/libx52.pc.in
index f0f4fc9..fd787f9 100644
--- a/libx52/libx52.pc.in
+++ b/libx52/libx52.pc.in
@@ -7,5 +7,5 @@ Name: libx52
 Description: Linux/Unix library to control Saitek X52/X52Pro joystick extended functionality.
 Version: 2.4.0
 Libs: -L${libdir} -lx52
-Cflags: -I${includedir}/x52pro
+Cflags: -I${includedir}/libx52
 Requires.private: @LIBUSB_PC@
diff --git a/libx52io/libx52io.pc.in b/libx52io/libx52io.pc.in
index 2f0a8b5..1e07269 100644
--- a/libx52io/libx52io.pc.in
+++ b/libx52io/libx52io.pc.in
@@ -7,5 +7,5 @@ Name: libx52io
 Description: Linux/Unix library to read and parse X52 input
 Version: 1.0.0
 Libs: -L${libdir} -lx52io
-Cflags: -I${includedir}/x52pro
+Cflags: -I${includedir}/libx52
 Requires.private: @HIDAPI_PC@
diff --git a/libx52util/Makefile.am b/libx52util/Makefile.am
index a7864bb..d3f2694 100644
--- a/libx52util/Makefile.am
+++ b/libx52util/Makefile.am
@@ -16,6 +16,9 @@ libx52util_la_LDFLAGS = -version-info 1:0:0 $(WARN_LDFLAGS)
 # Header files that need to be copied
 x52include_HEADERS += libx52util/libx52util.h
 
+# pkg-config files
+pkgconfig_DATA += libx52util/libx52util.pc
+
 # Autogenerated file that needs to be cleaned up
 CLEANFILES += libx52util/util_char_map.c
 util_char_map_c_DEPENDS = \
diff --git a/libx52util/libx52util.pc.in b/libx52util/libx52util.pc.in
new file mode 100644
index 0000000..7a7967c
--- /dev/null
+++ b/libx52util/libx52util.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libx52util
+Description: Extra utility functions to manage X52 extended functionality
+Version: 1.0.0
+Libs: -L${libdir} -lx52util
+Cflags: -I${includedir}/libx52