stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Include data directory in /usr/share/tvheadend so default opentv config exists.

Browse source
This commit is contained in:
Adam Sutton 2012-06-29 14:30:19 +01:00
parent a3d555e9c1
commit f77ab23158
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -28,7 +28,7 @@ CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
CFLAGS += -Wmissing-prototypes -fms-extensions
LDFLAGS += -lrt -ldl
BUNDLES += docs/html docs/docresources src/webui/static
BUNDLES += docs/html docs/docresources src/webui/static data
#
# Core

4
src/epggrab/opentv.c
View file

@ -804,14 +804,14 @@ void opentv_init ( epggrab_module_list_t *list )
/* Load dictionaries */
if ((m = hts_settings_load("epggrab/opentv/dict")))
_opentv_dict_load(m);
if ((m = hts_settings_load("%sdata/epggrab/opentv/dict", dr)))
if ((m = hts_settings_load("%s/data/epggrab/opentv/dict", dr)))
_opentv_dict_load(m);
tvhlog(LOG_INFO, "opentv", "dictonaries loaded");
/* Load providers */
if ((m = hts_settings_load("epggrab/opentv/prov")))
_opentv_prov_load(m, list);
if ((m = hts_settings_load("%sdata/epggrab/opentv/prov", dr)))
if ((m = hts_settings_load("%s/data/epggrab/opentv/prov", dr)))
_opentv_prov_load(m, list);
tvhlog(LOG_INFO, "opentv", "providers loaded");
}

1
support/dataroot/wd.c
View file

@ -7,7 +7,6 @@ const char *tvheadend_dataroot(void)
static char cwd[256] = { 0 };
if (!*cwd) {
assert(getcwd(cwd, 254));
strcat(cwd, "/");
}
return cwd;
}