Merge branch 'sh/next'

diff --combined src/Makefile.am
index cf89c9a,8740198..b6d1a08
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -352,7 -352,7 +352,7 @@@ endi
  if BUILD_PLUGIN_IPVS
  pkglib_LTLIBRARIES += ipvs.la
  ipvs_la_SOURCES = ipvs.c
 -ipvs_la_CFLAGS = $(KERNEL_CFLAGS)
 +ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
  ipvs_la_LDFLAGS = -module -avoid-version
  collectd_LDADD += "-dlopen" ipvs.la
  collectd_DEPENDENCIES += ipvs.la
@@@ -789,7 -789,7 +789,7 @@@ endi
  if BUILD_PLUGIN_UUID
  pkglib_LTLIBRARIES += uuid.la
  uuid_la_SOURCES = uuid.c
 -uuid_la_CFLAGS  = $(BUILD_WITH_LIBHAL_CFLAGS)
 +uuid_la_CFLAGS  = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS)
  uuid_la_LIBADD  = $(BUILD_WITH_LIBHAL_LIBS)
  uuid_la_LDFLAGS = -module -avoid-version
  collectd_LDADD += "-dlopen" uuid.la
@@@ -868,7 -868,7 +868,7 @@@ install-exec-hook
        else \
                $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
        fi; \
-       cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/;
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+       $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
        $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
                $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;

diff --combined src/configfile.c
index b1030fe,ca0cafe..f9c20fc
--- 1/src/configfile.c
--- 2/src/configfile.c
+++ b/src/configfile.c
@@@ -276,7 -276,7 +276,7 @@@ static int dispatch_value_plugin (cons
        buffer_ptr = buffer + 1;
  
        return (cf_dispatch (plugin, ci->key, buffer_ptr));
 -} /* int plugin_conf_dispatch */
 +} /* int dispatch_value_plugin */
  
  static int dispatch_value (const oconfig_item_t *ci)
  {
@@@ -891,7 -891,7 +891,7 @@@ int cf_read (char *filename
  
        /* Read the default types.db if no `TypesDB' option was given. */
        if (cf_default_typesdb)
-               read_types_list (PLUGINDIR"/types.db");
+               read_types_list (PKGDATADIR"/types.db");
  
        return (0);
  } /* int cf_read */