Corrected pkgnames/dirnames

.gitignore

@@ -10,6 +10,7 @@ test/Makefile.in
 /compile
 config.guess
 config.sub
+config.h.in
 configure
 /depcomp
 /install-sh

Makefile.am

@@ -7,8 +7,10 @@ VERSION		= @VERSION@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmbus.pc
 
-dist_doc_DATA = \
-	README \
+
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+dist_docdir = $(DESTDIR)$(docdir)
+doc_DATA = README \
            COPYING \
            hardware/MBus_USB.pdf \
            hardware/MBus_USB.txt

configure.ac

@@ -8,7 +8,7 @@ dnl info@rscada.se
 dnl 
 dnl ----------------------------------------------------------------------------
 
-AC_INIT([mbus], [0.8.0], [info@rscada.se], [mbus], [http://www.rscada.se/libmbus/])
+AC_INIT([libmbus], [0.8.0], [info@rscada.se], [libmbus], [http://www.rscada.se/libmbus/])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 AC_CONFIG_MACRO_DIR([m4])

mbus/Makefile.am

@@ -12,7 +12,9 @@ VERSION		= @VERSION@
 
 AM_CPPFLAGS	= -I$(top_builddir) -I$(top_srcdir)
 
-pkginclude_HEADERS = mbus.h mbus-protocol.h mbus-tcp.h mbus-serial.h mbus-protocol-aux.h
+includedir = $(prefix)/include/mbus
+include_HEADERS = mbus.h mbus-protocol.h mbus-tcp.h mbus-serial.h mbus-protocol-aux.h
+
 lib_LTLIBRARIES	   = libmbus.la
 libmbus_la_SOURCES = mbus.c mbus-protocol.c mbus-tcp.c mbus-serial.c mbus-protocol-aux.c