remove cross-directory dependency in build system (#5012)
* remove cross-directory dependency in build system * remove unused pythondir_POST replace sysconfdir/netdata with configdir
Paweł Krupa committed
Dec 18, 2018 at 17:33 UTC
7c5440912622e09313210851fa099c1f8bf1226f
12 files changed
+6
-13
build/subst.inc
-2
@@ -2,8 +2,6 @@
2
if sed \
3
-e 's#[@]localstatedir_POST@#$(localstatedir)#g' \
4
-e 's#[@]sbindir_POST@#$(sbindir)#g' \
5
- -e 's#[@]sysconfdir_POST@#$(sysconfdir)#g' \
6
- -e 's#[@]pythondir_POST@#$(pythondir)#g' \
5
-e 's#[@]configdir_POST@#$(configdir)#g' \
6
-e 's#[@]libconfigdir_POST@#$(libconfigdir)#g' \
7
-e 's#[@]cachedir_POST@#$(cachedir)#g' \
collectors/charts.d.plugin/.keep
collectors/charts.d.plugin/Makefile.am
+1
-2
@@ -32,12 +32,11 @@ dist_charts_DATA = \
32
33
userchartsconfigdir=$(configdir)/charts.d
34
dist_userchartsconfig_DATA = \
35
- $(top_srcdir)/installer/.keep \
35
+ .keep \
36
$(NULL)
37
38
chartsconfigdir=$(libconfigdir)/charts.d
39
dist_chartsconfig_DATA = \
40
- $(top_srcdir)/installer/.keep \
40
$(NULL)
41
42
include ap/Makefile.inc
collectors/node.d.plugin/.keep
collectors/node.d.plugin/Makefile.am
+1
-2
@@ -23,12 +23,11 @@ dist_noinst_DATA = \
23
24
usernodeconfigdir=$(configdir)/node.d
25
dist_usernodeconfig_DATA = \
26
- $(top_srcdir)/installer/.keep \
26
+ .keep \
27
$(NULL)
28
29
nodeconfigdir=$(libconfigdir)/node.d
30
dist_nodeconfig_DATA = \
31
- $(top_srcdir)/installer/.keep \
31
$(NULL)
32
33
dist_node_DATA = \
collectors/python.d.plugin/.keep
collectors/python.d.plugin/Makefile.am
+1
-2
@@ -29,12 +29,11 @@ dist_python_DATA = \
29
30
userpythonconfigdir=$(configdir)/python.d
31
dist_userpythonconfig_DATA = \
32
- $(top_srcdir)/installer/.keep \
32
+ .keep \
33
$(NULL)
34
35
pythonconfigdir=$(libconfigdir)/python.d
36
dist_pythonconfig_DATA = \
37
- $(top_srcdir)/installer/.keep \
37
$(NULL)
38
39
include adaptec_raid/Makefile.inc
collectors/statsd.plugin/.keep
collectors/statsd.plugin/Makefile.am
+1
-2
@@ -9,12 +9,11 @@ dist_noinst_DATA = \
9
10
statsdconfigdir=$(libconfigdir)/statsd.d
11
dist_statsdconfig_DATA = \
12
- $(top_srcdir)/installer/.keep \
12
example.conf \
13
$(NULL)
14
15
userstatsdconfigdir=$(configdir)/statsd.d
16
dist_userstatsdconfig_DATA = \
18
- $(top_srcdir)/installer/.keep \
17
+ .keep \
18
$(NULL)
19
health/.keep
health/Makefile.am
+1
-2
@@ -16,12 +16,11 @@ dist_noinst_DATA = \
16
17
userhealthconfigdir=$(configdir)/health.d
18
dist_userhealthconfig_DATA = \
19
- $(top_srcdir)/installer/.keep \
19
+ .keep \
20
$(NULL)
21
22
healthconfigdir=$(libconfigdir)/health.d
23
dist_healthconfig_DATA = \
24
- $(top_srcdir)/installer/.keep \
24
health.d/adaptec_raid.conf \
25
health.d/apache.conf \
26
health.d/apcupsd.conf \
system/netdata-freebsd.in
+1
-1
@@ -12,7 +12,7 @@ pidfile="${pidfile}/netdata.pid"
12
command="@sbindir_POST@/netdata"
13
command_args="-P ${pidfile}"
14
15
-required_files="@sysconfdir_POST@/netdata/netdata.conf"
15
+required_files="@configdir_POST@/netdata.conf"
16
17
start_precmd="netdata_prestart"
18
stop_postcmd="netdata_poststop"