From 7a2bc6be83eac5d2e6f75e3162c691952260ec05 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 1 Oct 2016 11:06:11 +0200
Subject: [PATCH] - yWeb: replace hardcoded paths (/var/tuxbox/plugins ->
 %(PLUGINDIR_VAR))

---
 src/nhttpd/web/Makefile.am        | 1 +
 src/nhttpd/web/scripts/Y_Tools.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am
index 41b470401..86dd57c8c 100644
--- a/src/nhttpd/web/Makefile.am
+++ b/src/nhttpd/web/Makefile.am
@@ -105,5 +105,6 @@ install-data-hook:
 	find $(DESTDIR)$(PRIVATE_HTTPDDIR)/ -type f -print0 | xargs --no-run-if-empty -0 \
 		sed -i \
 			-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
+			-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
 	;
 
diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh
index 75179c4aa..2e93f8509 100755
--- a/src/nhttpd/web/scripts/Y_Tools.sh
+++ b/src/nhttpd/web/scripts/Y_Tools.sh
@@ -588,7 +588,7 @@ case "$1" in
 	automount_getline)		shift 1; do_automount_getline $* ;;
 	automount_setline)		shift 1; do_automount_setline $* ;;
 	restart_neutrino)		restart_neutrino ;;
-	have_plugin_scripts)	 find /var/tuxbox/plugins -name '*.sh' ;;
+	have_plugin_scripts)	 find %(PLUGINDIR_VAR) -name '*.sh' ;;
 
 	timer_get_tvinfo)
 		shift 1