- Add glib-2.0 dependency in modbus.pc

- Fix modbus.h path

configure.ac

@@ -15,6 +15,8 @@ AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR(libmodbus needs GLib 2.X))
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
+# Optional requirements to report via pkg-config (in modbus.pc)
+modbus_pkgdeps="glib-2.0"
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -30,6 +32,7 @@ AC_FUNC_MALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([inet_ntoa memset select socket])
 
+AC_SUBST(modbus_pkgdeps)
 AC_OUTPUT([
 Makefile
 src/Makefile
@@ -37,4 +40,3 @@ include/Makefile
 include/modbus/Makefile
 modbus.pc
 ])
-

include/modbus/Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
 # Include files to install
-libmodbusincludedir = $(includedir)/libmodbus
+libmodbusincludedir = $(includedir)/modbus
 libmodbusinclude_HEADERS = modbus.h