From a47f07e7c6a389156875d855c41f28b569f11914 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 1 Oct 2016 11:49:40 +0200 Subject: [PATCH] Move definions for WEBTVDIR[_VAR] directories to configure Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/32aed1162fce471d5562475448020d0d7526372e Author: Michael Liebmann Date: 2016-10-01 (Sat, 01 Oct 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 6 ++++++ src/zapit/include/zapit/settings.h | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f77289b2e..d355caa08 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -134,6 +134,12 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts, TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fonts, [--with-fontdir_var=PATH ],[where to find the fonts in /var]) +TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/neutrino/webtv, + [--with-webtvdir=PATH ],[where to find the webtv content]) + +TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/webtv, + [--with-webtvdir_var=PATH ],[where to find the webtv content /var]) + TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, [--with-gamesdir=PATH ],[where games data is stored]) diff --git a/src/zapit/include/zapit/settings.h b/src/zapit/include/zapit/settings.h index 1602d6c6f..48b1e5e28 100644 --- a/src/zapit/include/zapit/settings.h +++ b/src/zapit/include/zapit/settings.h @@ -49,8 +49,6 @@ #define SATELLITES_XML CONFIGDIR "/satellites.xml" #define TERRESTRIAL_XML CONFIGDIR "/terrestrial.xml" #define WEBTV_XML CONFIGDIR "/webtv_usr.xml" -#define WEBTVDIR DATADIR "/neutrino/webtv" //NI -#define WEBTVDIR_VAR "/var/tuxbox/webtv" //NI #define AUDIO_DEVICE "/dev/dvb/adapter0/audio0" #define DEMUX_DEVICE "/dev/dvb/adapter0/demux0"