From a6aebded5f267227a5323e60bc4c3ee78b8c75e3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 14 Jun 2019 22:40:28 +0200 Subject: [PATCH] - add LUAPLUGINDIR_VAR Signed-off-by: Thilo Graf --- acinclude.m4 | 4 ++++ data/y-web/Makefile.am | 1 + src/nhttpd/yhttpd_mods/mod_yparser.cpp | 1 + 3 files changed, 6 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index c2f9d270e..fda444f4c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -301,6 +301,9 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins, TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins, [--with-luaplugindir=PATH], [where to find Lua plugins]) +TUXBOX_APPS_DIRECTORY_ONE(luaplugindir_var, LUAPLUGINDIR_VAR, localstatedir, /var, /tuxbox/luaplugins, + [--with-luaplugindir_var=PATH], [where to find Lua plugins in /var]) + TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio, [--with-webradiodir=PATH], [where to find webradio content]) @@ -371,6 +374,7 @@ AC_SUBST(PLUGINDIR) AC_SUBST(PLUGINDIR_VAR) AC_SUBST(PLUGINDIR_MNT) AC_SUBST(LUAPLUGINDIR) +AC_SUBST(LUAPLUGINDIR_VAR) AC_SUBST(WEBRADIODIR) AC_SUBST(WEBRADIODIR_VAR) AC_SUBST(WEBTVDIR) diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 376530b1c..7bf2316da 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -122,6 +122,7 @@ install-data-hook: -e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ -e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \ + -e 's|%(LUAPLUGINDIR_VAR)|$(LUAPLUGINDIR_VAR)|g' \ -e 's|%(THEMESDIR)|$(THEMESDIR)|g' \ -e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \ -e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \ diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp index 9b1ab3300..45a9514cf 100644 --- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp +++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp @@ -471,6 +471,7 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) { else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR; else if (ycmd_name.compare("PLUGINDIR_MNT")) yresult = PLUGINDIR_MNT; else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR; + else if (ycmd_name.compare("LUAPLUGINDIR_VAR")) yresult = LUAPLUGINDIR_VAR; else if (ycmd_name.compare("THEMESDIR")) yresult = THEMESDIR; else if (ycmd_name.compare("THEMESDIR_VAR")) yresult = THEMESDIR_VAR; else if (ycmd_name.compare("WEBRADIODIR")) yresult = WEBRADIODIR;