From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 25 May 2016 16:35:53 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~293
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d67b510b1ec7c17b6e1f65e40b8d8fdb2f33c857;p=collectd.git

Merge branch 'collectd-5.5'
---

d67b510b1ec7c17b6e1f65e40b8d8fdb2f33c857
diff --cc src/Makefile.am
index 956d772a,dc07cb74..d54094f6
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -335,11 -317,8 +335,11 @@@ endi
  if BUILD_WITH_LIBUDEV
  disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS)
  disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS)
- disk_la_LIBADD += $(BULD_WITH_LIBUDEV_LIBS)
+ disk_la_LIBADD += $(BUILD_WITH_LIBUDEV_LIBS)
  endif
 +if BUILD_FREEBSD
 +disk_la_LIBADD += -ldevstat -lgeom
 +endif
  if BUILD_WITH_PERFSTAT
  disk_la_LIBADD += -lperfstat
  endif