-@@ -249,6 +249,7 @@ build/%: %.in
- -e 's|@@GOODSH@@|$(GOODSH)|g' \
- -e 's|@@BASH@@|$(BASH)|g' \
- -e 's|@@HASSETR@@|$(HASSETR)|g' \
-+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
- $< > $@;
-
-
-@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
- s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
- s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
- s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
-- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
-+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
-+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
- $< > $@
-
- build-doc: build-doc-stamp Makefile Makefile.config
-diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
---- munin-2.0.25.orig/Makefile.config 2015-09-08 10:02:24.000000000 +0000
-+++ munin-2.0.25/Makefile.config 2015-09-08 10:12:45.899593251 +0000
+@@ -270,6 +270,7 @@ build/%: %.in
+ -e 's|@@GOODSH@@|$(GOODSH)|g' \
+ -e 's|@@BASH@@|$(BASH)|g' \
+ -e 's|@@HASSETR@@|$(HASSETR)|g' \
++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
+ $< > $@;
+
+
+@@ -312,6 +313,7 @@ substitute-confvar-inline:
+ -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \
+ -e 's|\@\@BASH\@\@|$(BASH)|g;' \
+ -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \
++ -e 's|\@\@TEMPLATEDIR\@\@|$(TEMPLATEDIR)|g;' \
+ $(CONFVAR_SUBSTITUTION_FILES)
+
+
+@@ -365,7 +367,8 @@ substitute-build-defaults-inline:
+ s{(PLUGINUSER\s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
+ s{(GOODSH\s+=\s).*}{\1q{$(GOODSH)};}x; \
+ s{(BASH\s+=\s).*}{\1q{$(BASH)};}x; \
+- s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x;' \
++ s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x; \
++ s{(TEMPLATEDIR\s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;' \
+ common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
+
+
+diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
+--- munin-2.0.42.orig/Makefile.config 2018-10-12 11:45:59.366033000 +0000
++++ munin-2.0.42/Makefile.config 2018-10-12 11:46:23.060033000 +0000