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

acinclude: add possibility to define logodir

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35939e7562
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-07-04 (Sun, 04 Jul 2021)

Origin message was:
------------------
- acinclude: add possibility to define logodir

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-07-04 21:41:35 +02:00
parent dacc584894
commit e3f2deebba
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@@ -324,6 +324,12 @@ TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/
TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
[--with-iconsdir_var=PATH], [where to find icons in /var])
TUXBOX_APPS_DIRECTORY_ONE(logodir, LOGODIR, datadir, /share, /tuxbox/neutrino/icons/logo,
[--with-logodir=PATH], [where to find channel logos])
TUXBOX_APPS_DIRECTORY_ONE(logodir_var, LOGODIR_VAR, localstatedir, /var, /tuxbox/icons/logo,
[--with-logodir_var=PATH], [where to find channel logos in /var])
TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
[--with-private_httpddir=PATH], [where to find private httpd files])
@@ -363,6 +369,8 @@ AC_SUBST(THEMESDIR)
AC_SUBST(THEMESDIR_VAR)
AC_SUBST(ICONSDIR)
AC_SUBST(ICONSDIR_VAR)
AC_SUBST(LOGODIR)
AC_SUBST(LOGODIR_VAR)
AC_SUBST(PRIVATE_HTTPDDIR)
AC_SUBST(PUBLIC_HTTPDDIR)
AC_SUBST(HOSTED_HTTPDDIR)

2
src/global.h
View File

@@ -51,8 +51,6 @@
#define NEUTRINO_CONF_MIGRATION_SCRIPT CONTROLDIR "/migration.sh"
#define COVERDIR_TMP "/tmp/.cover"
#define LOGODIR ICONSDIR "/logo"
#define LOGODIR_VAR ICONSDIR_VAR "/logo"
#define LOGODIR_TMP "/tmp/.logo"
NEUTRINO_CPP SNeutrinoSettings g_settings;