From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Feb 2020 06:42:14 +0000 Subject: [PATCH] no files in etc and var MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- collectors/Makefile.am | 2 +- collectors/charts.d.plugin/Makefile.am | 2 +- collectors/node.d.plugin/Makefile.am | 2 +- collectors/python.d.plugin/Makefile.am | 2 +- collectors/statsd.plugin/Makefile.am | 2 +- health/Makefile.am | 2 +- system/Makefile.am | 3 +-- web/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/collectors/Makefile.am b/collectors/Makefile.am index 9bb52958..c9799165 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am @@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am index 03c7f0a9..01985db0 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) chartsconfigdir=$(libconfigdir)/charts.d diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am index c3142d43..95e32445 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am @@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) nodeconfigdir=$(libconfigdir)/node.d diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am index e678f86a..29a319da 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) pythonconfigdir=$(libconfigdir)/python.d diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am index b01302d1..f5b77da4 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am @@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am index 853ed0d7..210330a6 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am index ad68c655..74f032f9 100644 --- a/system/Makefile.am +++ b/system/Makefile.am @@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ - edit-config \ $(NULL) # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(configdir) nodist_noinst_DATA = \ diff --git a/web/Makefile.am b/web/Makefile.am index ccaccd76..16a2977e 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ -- 2.25.0