From 28d5e66f902e9c9d6d08c081ba43904eb658b1e4 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 24 Nov 2020 21:27:02 +0100 Subject: [PATCH] - fix 56fb558f1cb04056d451cfe55c1631381889f6a4 Signed-off-by: Thilo Graf commit was: - setting_helpers: remove some hardcoded paths d5950fbe60226f8eb999c561f6ddc543f709e807 --- src/gui/osdlang_setup.cpp | 2 +- src/system/setting_helpers.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index e91fcef95..43b8cdf6f 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -153,7 +153,7 @@ CMenuOptionStringChooser* COsdLangSetup::getTzItems() if(zptr) zone = zptr; //printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str()); - if (access("/usr/share/zoneinfo/" + zone, R_OK)) + if (access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK)) printf("[neutrino] timezone file '%s' not installed\n", zone.c_str()); else { diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 5162af196..e29e5b962 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -498,7 +498,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data) const char *zptr = xmlGetAttribute(search, "zone"); if(zptr) zone = zptr; - if (!access(DATADIR "/zoneinfo/" + zone, R_OK)) + if (!access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK)) found = true; break; } @@ -509,7 +509,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data) } if(found) { printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str()); - std::string cmd = DATADIR "/zoneinfo/" + zone; + std::string cmd = TARGET_PREFIX "/share/zoneinfo/" + zone; printf("symlink %s to /etc/localtime\n", cmd.c_str()); if (unlink("/etc/localtime")) perror("unlink failed");