1 files changed, 98 insertions, 33 deletions

diff --git a/system/Makefile.am b/system/Makefile.am
index 1a1b41e2..13466639 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -3,16 +3,18 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 CLEANFILES = \
-    netdata-openrc \
-    netdata.logrotate \
-    netdata.service \
-    netdata.service.v235 \
-    netdata-init-d \
-    netdata-lsb \
-    netdata-freebsd \
-    netdata.plist \
-    netdata.crontab \
-    netdata-updater.service \
+    cron/netdata-updater-daily \
+    freebsd/rc.d/netdata \
+    initd/init.d/netdata \
+    launchd/netdata.plist \
+    logrotate/netdata \
+    lsb/init.d/netdata \
+    openrc/conf.d/netdata \
+    openrc/init.d/netdata \
+    runit/run \
+    systemd/netdata.service \
+    systemd/netdata.service.v235 \
+    systemd/netdata-updater.service \
     $(NULL)
 
 include $(top_srcdir)/build/subst.inc
@@ -26,44 +28,107 @@ dist_config_DATA = \
     .install-type \
     $(NULL)
 
+libconfigvnodesdir=$(libconfigdir)/vnodes
+libsyscrondir=$(libsysdir)/cron
+libsysfreebsddir=$(libsysdir)/freebsd
+libsysfreebsdrcddir=$(libsysfreebsddir)/rc.d
+libsysinitddir=$(libsysdir)/initd
+libsysinitdinitddir=$(libsysinitddir)/init.d
+libsyslaunchddir=$(libsysdir)/launchd
+libsyslogrotatedir=$(libsysdir)/logrotate
+libsyslsbdir=$(libsysdir)/lsb
+libsyslsbinitddir=$(libsyslsbdir)/init.d
+libsysopenrcdir=$(libsysdir)/openrc
+libsysopenrcinitddir=$(libsysopenrcdir)/init.d
+libsysopenrcconfddir=$(libsysopenrcdir)/conf.d
+libsysrunitdir=$(libsysdir)/runit
+libsyssystemddir=$(libsysdir)/systemd
+
 # Explicitly install directories to avoid permission issues due to umask
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)$(configdir)
 	$(INSTALL) -d $(DESTDIR)$(libsysdir)
+	$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
+	$(INSTALL) -d $(DESTDIR)$(libsysfreebsdrcddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysinitdinitddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslaunchddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslogrotatedir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslsbinitddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyssystemddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysopenrcinitddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysopenrcconfddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysrunitdir)
+	$(INSTALL) -d $(DESTDIR)$(libconfigvnodesdir)
+
+dist_libconfigvnodes_DATA = \
+    vnodes/vnodes.conf
+    $(NULL)
 
 libexecnetdatadir=$(libexecdir)/netdata
 nodist_libexecnetdata_SCRIPTS = \
     install-service.sh \
     $(NULL)
 
-nodist_libsys_DATA = \
-    netdata-openrc \
-    netdata.logrotate \
-    netdata.service \
-    netdata.service.v235 \
-    netdata-init-d \
-    netdata-lsb \
-    netdata-freebsd \
-    netdata.plist \
-    netdata.crontab \
-    netdata-updater.service \
+nodist_libsyscron_DATA = \
+    cron/netdata-updater-daily \
+    $(NULL)
+
+nodist_libsysfreebsdrcd_DATA = \
+    freebsd/rc.d/netdata \
+    $(NULL)
+
+nodist_libsysinitdinitd_DATA = \
+    initd/init.d/netdata \
+    $(NULL)
+
+nodist_libsyslaunchd_DATA = \
+    launchd/netdata.plist \
+    $(NULL)
+
+nodist_libsyslogrotate_DATA = \
+    logrotate/netdata \
+    $(NULL)
+
+nodist_libsyslsbinitd_DATA = \
+    lsb/init.d/netdata \
+    $(NULL)
+
+nodist_libsysopenrcinitd_DATA = \
+    openrc/init.d/netdata \
+    $(NULL)
+
+nodist_libsysopenrcconfd_DATA = \
+    openrc/conf.d/netdata \
+    $(NULL)
+
+nodist_libsysrunit_DATA = \
+    runit/run \
+    $(NULL)
+
+nodist_libsyssystemd_DATA = \
+    systemd/netdata.service \
+    systemd/netdata.service.v235 \
+    systemd/netdata-updater.service \
     $(NULL)
 
-dist_libsys_DATA = \
-    netdata-updater.timer \
+dist_libsyssystemd_DATA = \
+    systemd/netdata-updater.timer \
+    systemd/50-netdata.preset
     $(NULL)
 
 dist_noinst_DATA = \
     install-service.sh.in \
-    netdata-openrc.in \
-    netdata.logrotate.in \
-    netdata.service.in \
-    netdata.service.v235.in \
-    netdata-init-d.in \
-    netdata-lsb.in \
-    netdata-freebsd.in \
-    netdata.plist.in \
     netdata.conf \
-    netdata.crontab.in \
-    netdata-updater.service.in \
+    cron/netdata-updater-daily.in \
+    freebsd/rc.d/netdata.in \
+    initd/init.d/netdata.in \
+    launchd/netdata.plist.in \
+    logrotate/netdata.in \
+    lsb/init.d/netdata.in \
+    openrc/conf.d/netdata.in \
+    openrc/init.d/netdata.in \
+    runit/run.in \
+    systemd/netdata.service.in \
+    systemd/netdata.service.v235.in \
+    systemd/netdata-updater.service.in \
     $(NULL)