Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 40 deletions

diff --git a/web/gui/Makefile.am b/web/gui/Makefile.am
index 938d56836..f00744d64 100644
--- a/web/gui/Makefile.am
+++ b/web/gui/Makefile.am
@@ -13,66 +13,66 @@ SUBDIRS = \
     $(NULL)
 
 DASHBOARD_JS_FILES = \
-    src/dashboard.js/prologue.js.inc \
-    src/dashboard.js/utils.js \
-    src/dashboard.js/server-detection.js \
-    src/dashboard.js/dependencies.js \
-    src/dashboard.js/error-handling.js \
-    src/dashboard.js/compatibility.js \
-    src/dashboard.js/xss.js \
-    src/dashboard.js/colors.js \
-    src/dashboard.js/units-conversion.js \
-    src/dashboard.js/options.js \
-    src/dashboard.js/localstorage.js \
-    src/dashboard.js/timeout.js \
-    src/dashboard.js/themes.js \
-    src/dashboard.js/charting/dygraph.js \
-    src/dashboard.js/charting/sparkline.js \
-    src/dashboard.js/charting/google-charts.js \
-    src/dashboard.js/charting/gauge.js \
-    src/dashboard.js/charting/easy-pie-chart.js \
-    src/dashboard.js/charting/d3pie.js \
-    src/dashboard.js/charting/d3.js \
-    src/dashboard.js/charting/peity.js \
-    src/dashboard.js/charting/textonly.js \
-    src/dashboard.js/charting.js \
-    src/dashboard.js/chart-registry.js \
-    src/dashboard.js/common.js \
-    src/dashboard.js/main.js \
-    src/dashboard.js/alarms.js \
-    src/dashboard.js/registry.js \
-    src/dashboard.js/boot.js \
-    src/dashboard.js/epilogue.js.inc \
+    $(srcdir)/src/dashboard.js/prologue.js.inc \
+    $(srcdir)/src/dashboard.js/utils.js \
+    $(srcdir)/src/dashboard.js/server-detection.js \
+    $(srcdir)/src/dashboard.js/dependencies.js \
+    $(srcdir)/src/dashboard.js/error-handling.js \
+    $(srcdir)/src/dashboard.js/compatibility.js \
+    $(srcdir)/src/dashboard.js/xss.js \
+    $(srcdir)/src/dashboard.js/colors.js \
+    $(srcdir)/src/dashboard.js/units-conversion.js \
+    $(srcdir)/src/dashboard.js/options.js \
+    $(srcdir)/src/dashboard.js/localstorage.js \
+    $(srcdir)/src/dashboard.js/timeout.js \
+    $(srcdir)/src/dashboard.js/themes.js \
+    $(srcdir)/src/dashboard.js/charting/dygraph.js \
+    $(srcdir)/src/dashboard.js/charting/sparkline.js \
+    $(srcdir)/src/dashboard.js/charting/google-charts.js \
+    $(srcdir)/src/dashboard.js/charting/gauge.js \
+    $(srcdir)/src/dashboard.js/charting/easy-pie-chart.js \
+    $(srcdir)/src/dashboard.js/charting/d3pie.js \
+    $(srcdir)/src/dashboard.js/charting/d3.js \
+    $(srcdir)/src/dashboard.js/charting/peity.js \
+    $(srcdir)/src/dashboard.js/charting/textonly.js \
+    $(srcdir)/src/dashboard.js/charting.js \
+    $(srcdir)/src/dashboard.js/chart-registry.js \
+    $(srcdir)/src/dashboard.js/common.js \
+    $(srcdir)/src/dashboard.js/main.js \
+    $(srcdir)/src/dashboard.js/alarms.js \
+    $(srcdir)/src/dashboard.js/registry.js \
+    $(srcdir)/src/dashboard.js/boot.js \
+    $(srcdir)/src/dashboard.js/epilogue.js.inc \
     $(NULL)
 
 dist_noinst_DATA = \
-    README.md \
+    $(srcdir)/README.md \
     $(DASHBOARD_JS_FILES) \
     $(NULL)
 
 dist_web_DATA = \
     dashboard.js \
-    dashboard_info.js \
-    dashboard_info_custom_example.js \
-    main.css \
-    main.js \
+    $(srcdir)/dashboard_info.js \
+    $(srcdir)/dashboard_info_custom_example.js \
+    $(srcdir)/main.css \
+    $(srcdir)/main.js \
     version.txt \
     $(NULL)
 
 webolddir=$(webdir)/old
 dist_webold_DATA = \
-    old/index.html \
+    $(srcdir)/old/index.html \
     $(NULL)
 
 webstaticdir=$(webdir)/static/img
 dist_webstatic_DATA = \
-    static/img/netdata-logomark.svg \
+    $(srcdir)/static/img/netdata-logomark.svg \
     $(NULL)
 
 webcssdir=$(webdir)/css
 dist_webcss_DATA = \
-    css/morris-0.5.1.css \
-    css/c3-0.4.18.min.css \
+    $(srcdir)/css/morris-0.5.1.css \
+    $(srcdir)/css/c3-0.4.18.min.css \
     $(NULL)
 
 dashboard.js: $(DASHBOARD_JS_FILES)
@@ -85,7 +85,7 @@ dist_webwellknown_DATA = \
 
 webdntdir=$(webdir)/.well-known/dnt
 dist_webdnt_DATA = \
-    .well-known/dnt/cookies \
+    $(srcdir)/.well-known/dnt/cookies \
     $(NULL)
 
 version.txt: