mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

acinclude: introduce --with-controldir=PATH and --with-controldir_var=PATH for control scripts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bea70cffa9
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-26 (Sat, 26 Jan 2019)

Origin message was:
------------------
- acinclude: introduce --with-controldir=PATH and --with-controldir_var=PATH for control scripts

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-01-26 17:05:43 +01:00
parent e348e454fc
commit 8850cd14bc
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@@ -233,6 +233,12 @@ TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/con
TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
[--with-datadir=PATH], [where to find data files])
TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
[--with-controldir=PATH], [where to find control scripts])
TUXBOX_APPS_DIRECTORY_ONE(controldir_var, CONTROLDIR_VAR, localstatedir, /var, /tuxbox/control,
[--with-controldir_var=PATH], [where to find control scripts in /var])
TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
[--with-fontdir=PATH], [where to find fonts])
@@ -303,6 +309,8 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
dnl automake <= 1.6 needs this specifications
AC_SUBST(CONFIGDIR)
AC_SUBST(DATADIR)
AC_SUBST(CONTROLDIR)
AC_SUBST(CONTROLDIR_VAR)
AC_SUBST(FONTDIR)
AC_SUBST(FONTDIR_VAR)
AC_SUBST(GAMESDIR)

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

@@ -127,6 +127,8 @@ install-data-hook:
sed -i \
-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
-e 's|%(DATADIR)|$(DATADIR)|g' \
-e 's|%(CONTROLDIR)|$(CONTROLDIR)|g' \
-e 's|%(CONTROLDIR_VAR)|$(CONTROLDIR_VAR)|g' \
-e 's|%(FONTDIR)|$(FONTDIR)|g' \
-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
-e 's|%(LIBDIR)|$(LIBDIR)|g' \

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

@@ -452,6 +452,8 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
else if (ycmd_type == "define-get") {
if (ycmd_name.compare("CONFIGDIR")) yresult = CONFIGDIR;
else if (ycmd_name.compare("DATADIR")) yresult = DATADIR;
else if (ycmd_name.compare("CONTROLDIR")) yresult = CONTROLDIR;
else if (ycmd_name.compare("CONTROLDIR_VAR")) yresult = CONTROLDIR_VAR;
else if (ycmd_name.compare("FONTDIR")) yresult = FONTDIR;
else if (ycmd_name.compare("FONTDIR_VAR")) yresult = FONTDIR_VAR;
else if (ycmd_name.compare("LIBDIR")) yresult = LIBDIR;