mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- add LUAPLUGINDIR_VAR

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-06-14 22:40:28 +02:00
committed by Thilo Graf
parent 4893ec9149
commit a6aebded5f
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -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, TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
[--with-luaplugindir=PATH], [where to find Lua plugins]) [--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, TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
[--with-webradiodir=PATH], [where to find webradio content]) [--with-webradiodir=PATH], [where to find webradio content])
@@ -371,6 +374,7 @@ AC_SUBST(PLUGINDIR)
AC_SUBST(PLUGINDIR_VAR) AC_SUBST(PLUGINDIR_VAR)
AC_SUBST(PLUGINDIR_MNT) AC_SUBST(PLUGINDIR_MNT)
AC_SUBST(LUAPLUGINDIR) AC_SUBST(LUAPLUGINDIR)
AC_SUBST(LUAPLUGINDIR_VAR)
AC_SUBST(WEBRADIODIR) AC_SUBST(WEBRADIODIR)
AC_SUBST(WEBRADIODIR_VAR) AC_SUBST(WEBRADIODIR_VAR)
AC_SUBST(WEBTVDIR) AC_SUBST(WEBTVDIR)

1
data/y-web/Makefile.am
View File

@@ -122,6 +122,7 @@ install-data-hook:
-e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \ -e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \
-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
-e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \ -e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \
-e 's|%(LUAPLUGINDIR_VAR)|$(LUAPLUGINDIR_VAR)|g' \
-e 's|%(THEMESDIR)|$(THEMESDIR)|g' \ -e 's|%(THEMESDIR)|$(THEMESDIR)|g' \
-e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \ -e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \
-e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \ -e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \

1
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -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_VAR")) yresult = PLUGINDIR_VAR;
else if (ycmd_name.compare("PLUGINDIR_MNT")) yresult = PLUGINDIR_MNT; else if (ycmd_name.compare("PLUGINDIR_MNT")) yresult = PLUGINDIR_MNT;
else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR; 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")) yresult = THEMESDIR;
else if (ycmd_name.compare("THEMESDIR_VAR")) yresult = THEMESDIR_VAR; else if (ycmd_name.compare("THEMESDIR_VAR")) yresult = THEMESDIR_VAR;
else if (ycmd_name.compare("WEBRADIODIR")) yresult = WEBRADIODIR; else if (ycmd_name.compare("WEBRADIODIR")) yresult = WEBRADIODIR;