From 46c14110cea8703bdf4ce60ffc236b42d6e9a17e Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Sun, 31 May 2020 17:45:27 +0200
Subject: [PATCH] 7.6::Calendar: Fix failures with PIKE_MODULE_RELOC
---
lib/modules/Calendar.pmod/Events.pmod | 4 ++--
lib/modules/Calendar.pmod/TZnames.pmod | 2 +-
lib/modules/Calendar.pmod/Timezone.pmod | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/modules/Calendar.pmod/Events.pmod b/lib/modules/Calendar.pmod/Events.pmod
index dcf24f0671..88488cd43f 100644
--- a/lib/modules/Calendar.pmod/Events.pmod
+++ b/lib/modules/Calendar.pmod/Events.pmod
@@ -13,7 +13,7 @@ constant wd2n=(["Mon":1,"Tue":2,"Wed":3,"Thu":4,"Fri":5,"Sat":6,"Sun":7]);
void read_all_data()
{
all_data=master()->master_read_file(
- combine_path(__FILE__,"../events/regional"));
+ master()->combine_path_with_cwd(__FILE__,"../events/regional"));
}
@@ -229,7 +229,7 @@ mapping made_namedays=([]);
string read_all_namedays()
{
return master()->master_read_file(
- combine_path(__FILE__,"../events/namedays"));
+ master()->combine_path_with_cwd(__FILE__,"../events/namedays"));
}
diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index 2294d2f707..9d3d7a1a96 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -32,7 +32,7 @@ string _zone_tab()
{
return raw_zone_tab ||
(raw_zone_tab = ( master()->master_read_file(
- combine_path(__FILE__,"..","tzdata/zone.tab")) - "\r"));
+ master()->combine_path_with_cwd(__FILE__,"..","tzdata/zone.tab")) - "\r"));
}
protected array(array(string)) parsed_zone_tab=0;
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 9c80b2849b..10c2ff33fd 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -1305,7 +1305,7 @@ class Runtime_timezone_compiler
}
- string base_path=combine_path(__FILE__,"../tzdata/");
+ string base_path=master()->combine_path_with_cwd(__FILE__,"../tzdata/");
array files=
({
"africa",
--
GitLab