From 12b9efaebb6d008437af4a72a98d05c4319fc825 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 28 Dec 2018 15:42:52 +0100
Subject: Merging upstream version 1.11.1+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/freebsd.plugin/Makefile.am |  4 ++++
 collectors/freebsd.plugin/Makefile.in | 11 +++++++++--
 collectors/freebsd.plugin/README.md   |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 collectors/freebsd.plugin/README.md

(limited to 'collectors/freebsd.plugin')

diff --git a/collectors/freebsd.plugin/Makefile.am b/collectors/freebsd.plugin/Makefile.am
index e80ec702d..ca4d4ddd7 100644
--- a/collectors/freebsd.plugin/Makefile.am
+++ b/collectors/freebsd.plugin/Makefile.am
@@ -3,3 +3,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+	README.md \
+	$(NULL)
diff --git a/collectors/freebsd.plugin/Makefile.in b/collectors/freebsd.plugin/Makefile.in
index c88b3d755..d3332677b 100644
--- a/collectors/freebsd.plugin/Makefile.in
+++ b/collectors/freebsd.plugin/Makefile.in
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -80,7 +81,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = collectors/freebsd.plugin
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_noinst_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/m4/ax_c___atomic.m4 \
 	$(top_srcdir)/build/m4/ax_c__generic.m4 \
@@ -117,6 +119,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+DATA = $(dist_noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -267,6 +270,10 @@ varlibdir = @varlibdir@
 webdir = @webdir@
 AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+dist_noinst_DATA = \
+	README.md \
+	$(NULL)
+
 all: all-am
 
 .SUFFIXES:
@@ -339,7 +346,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
 install: install-am
 install-exec: install-exec-am
diff --git a/collectors/freebsd.plugin/README.md b/collectors/freebsd.plugin/README.md
new file mode 100644
index 000000000..e6302f420
--- /dev/null
+++ b/collectors/freebsd.plugin/README.md
@@ -0,0 +1,3 @@
+# freebsd
+
+Collects resource usage and performance data on FreeBSD systems
-- 
cgit v1.2.3