From f77ab231580e96d409d18639af886c7e3102a2dc Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 29 Jun 2012 14:30:19 +0100 Subject: [PATCH] Include data directory in /usr/share/tvheadend so default opentv config exists. --- Makefile | 2 +- src/epggrab/opentv.c | 4 ++-- support/dataroot/wd.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2c8178e9..537b25e7 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/src/epggrab/opentv.c b/src/epggrab/opentv.c index 40b38f4f..7e7ead3f 100644 --- a/src/epggrab/opentv.c +++ b/src/epggrab/opentv.c @@ -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"); } diff --git a/support/dataroot/wd.c b/support/dataroot/wd.c index 52da7f52..bda80485 100644 --- a/support/dataroot/wd.c +++ b/support/dataroot/wd.c @@ -7,7 +7,6 @@ const char *tvheadend_dataroot(void) static char cwd[256] = { 0 }; if (!*cwd) { assert(getcwd(cwd, 254)); - strcat(cwd, "/"); } return cwd; }