From 9df213ccd3d23993dbd116be632ac79db011cb9c Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Thu, 22 Apr 2010 13:53:06 -0700
Subject: [PATCH] Fix inconsistent pkg-config file

---
 Makefile.am                  |  2 +-
 debian/libmodbus-dev.install |  2 +-
 libmodbus.pc.in              | 10 ++++++++++
 libmodbus.spec               |  2 +-
 modbus.pc.in                 | 10 ----------
 5 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 libmodbus.pc.in
 delete mode 100644 modbus.pc.in

diff --git a/Makefile.am b/Makefile.am
index 99c2a71..59f0bfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,4 @@ EXTRA_DIST = MIGRATION libmodbus.spec
 SUBDIRS = modbus tests
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = modbus.pc
+pkgconfig_DATA = libmodbus.pc
diff --git a/debian/libmodbus-dev.install b/debian/libmodbus-dev.install
index 101effb..197100b 100644
--- a/debian/libmodbus-dev.install
+++ b/debian/libmodbus-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/include/modbus/*
 debian/tmp/usr/lib/libmodbus.so
-debian/tmp/usr/lib/pkgconfig/modbus.pc
+debian/tmp/usr/lib/pkgconfig/libmodbus.pc
diff --git a/libmodbus.pc.in b/libmodbus.pc.in
new file mode 100644
index 0000000..0c869df
--- /dev/null
+++ b/libmodbus.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: modbus
+Description: Modbus library
+Version: @VERSION@
+Libs: -L${libdir} -lmodbus
+Cflags: -I${includedir}
diff --git a/libmodbus.spec b/libmodbus.spec
index 7606632..0ed1170 100644
--- a/libmodbus.spec
+++ b/libmodbus.spec
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/libmodbus.so
 %attr(0755,root,root) %{_libdir}/libmodbus.so.2.0.3
 %attr(0755,root,root) %{_libdir}/libmodbus.la
-%attr(0644,root,root) %{_libdir}/pkgconfig/modbus.pc
+%attr(0644,root,root) %{_libdir}/pkgconfig/libmodbus.pc
 %attr(0644,root,root) %{_includedir}/modbus/modbus.h
 %doc AUTHORS ChangeLog INSTALL NEWS COPYING* README
 
diff --git a/modbus.pc.in b/modbus.pc.in
deleted file mode 100644
index 0c869df..0000000
--- a/modbus.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: modbus
-Description: Modbus library
-Version: @VERSION@
-Libs: -L${libdir} -lmodbus
-Cflags: -I${includedir}
--
libgit2 0.21.4