Peter M. Groen / libmodbus

Commit 9df213ccd3d23993dbd116be632ac79db011cb9c

Authored by Bryan Hundven
Committed by Stéphane Raimbault
1 parent 2d90cd56

Fix inconsistent pkg-config file 

Some files reference modbus.pc or modbus.pc.in while other files
reference libmodbus.pc or libmodbus.pc.in.

Let stick with libmodbus.pc or libmodbus.pc.in.
Inline Side-by-side
Showing 4 changed files with 3 additions and 3 deletions
Makefile.am
  View file @9df213c
@@ -2,4 +2,4 @@ EXTRA_DIST = MIGRATION libmodbus.spec @@ -2,4 +2,4 @@ EXTRA_DIST = MIGRATION libmodbus.spec
2 SUBDIRS = modbus tests 2 SUBDIRS = modbus tests
3 3
4 pkgconfigdir = $(libdir)/pkgconfig 4 pkgconfigdir = $(libdir)/pkgconfig
5 -pkgconfig_DATA = modbus.pc 5 +pkgconfig_DATA = libmodbus.pc
debian/libmodbus-dev.install
  View file @9df213c
1 debian/tmp/usr/include/modbus/* 1 debian/tmp/usr/include/modbus/*
2 debian/tmp/usr/lib/libmodbus.so 2 debian/tmp/usr/lib/libmodbus.so
3 -debian/tmp/usr/lib/pkgconfig/modbus.pc 3 +debian/tmp/usr/lib/pkgconfig/libmodbus.pc
modbus.pc.in renamed to libmodbus.pc.in
  View file @9df213c
libmodbus.spec
  View file @9df213c
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT @@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
51 %dir %{_libdir}/libmodbus.so 51 %dir %{_libdir}/libmodbus.so
52 %attr(0755,root,root) %{_libdir}/libmodbus.so.2.0.3 52 %attr(0755,root,root) %{_libdir}/libmodbus.so.2.0.3
53 %attr(0755,root,root) %{_libdir}/libmodbus.la 53 %attr(0755,root,root) %{_libdir}/libmodbus.la
54 -%attr(0644,root,root) %{_libdir}/pkgconfig/modbus.pc 54 +%attr(0644,root,root) %{_libdir}/pkgconfig/libmodbus.pc
55 %attr(0644,root,root) %{_includedir}/modbus/modbus.h 55 %attr(0644,root,root) %{_includedir}/modbus/modbus.h
56 %doc AUTHORS ChangeLog INSTALL NEWS COPYING* README 56 %doc AUTHORS ChangeLog INSTALL NEWS COPYING* README
57 57