mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
1d2a2dc7d0
https://github.com/netdata/netdata/releases/tag/v1.41.0 Reflowed & updated 2 patches: - etc/var one - skip configure one
116 lines
3.8 KiB
Diff
116 lines
3.8 KiB
Diff
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
|
|
index 2aec3dd3e..27385ec28 100644
|
|
--- a/collectors/Makefile.am
|
|
+++ b/collectors/Makefile.am
|
|
@@ -31,7 +31,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 03c7f0a94..01985db01 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/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am
|
|
index 2d5f92a6b..8b11c7502 100644
|
|
--- a/collectors/ebpf.plugin/Makefile.am
|
|
+++ b/collectors/ebpf.plugin/Makefile.am
|
|
@@ -9,7 +9,7 @@ SUFFIXES = .in
|
|
userebpfconfigdir=$(configdir)/ebpf.d
|
|
|
|
# Explicitly install directories to avoid permission issues due to umask
|
|
-install-exec-local:
|
|
+no-install-exec-local:
|
|
$(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
|
|
|
|
dist_noinst_DATA = \
|
|
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
|
|
index ca49c1c02..1b9bcc446 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 c8144c137..f8aaa89b6 100644
|
|
--- a/collectors/statsd.plugin/Makefile.am
|
|
+++ b/collectors/statsd.plugin/Makefile.am
|
|
@@ -19,5 +19,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 20e000860..add0137b3 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 54e9278c8..e7cc7acea 100644
|
|
--- a/system/Makefile.am
|
|
+++ b/system/Makefile.am
|
|
@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc
|
|
SUFFIXES = .in
|
|
|
|
dist_config_SCRIPTS = \
|
|
- edit-config \
|
|
$(NULL)
|
|
|
|
dist_config_DATA = \
|
|
- .install-type \
|
|
- netdata-updater.conf \
|
|
$(NULL)
|
|
|
|
libconfigvnodesdir=$(libconfigdir)/vnodes
|
|
@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
|
|
libsyssystemddir=$(libsysdir)/systemd
|
|
|
|
# Explicitly install directories to avoid permission issues due to umask
|
|
-install-exec-local:
|
|
+no-install-exec-local:
|
|
$(INSTALL) -d $(DESTDIR)$(configdir)
|
|
$(INSTALL) -d $(DESTDIR)$(libsysdir)
|
|
$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
|
|
diff --git a/web/Makefile.am b/web/Makefile.am
|
|
index be2c545c3..55f373114 100644
|
|
--- a/web/Makefile.am
|
|
+++ b/web/Makefile.am
|
|
@@ -13,7 +13,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 = \
|