From: Clifford Wolf Date: Sun, 27 Oct 2013 09:05:19 +0000 (+0100) Subject: Fixed get_share_file_name() for installed yosys X-Git-Tag: yosys-0.2.0~435 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f39c0c992839fb79f667d404a6edc85bcb662dcf;p=yosys.git Fixed get_share_file_name() for installed yosys --- diff --git a/kernel/driver.cc b/kernel/driver.cc index d726639c4..1e8b86a36 100644 --- a/kernel/driver.cc +++ b/kernel/driver.cc @@ -430,12 +430,13 @@ std::string get_share_file_name(std::string file) log_error("Can't find file `%s': reading of /proc/self/exe failed!\n", file.c_str()); buffer[buflen] = 0; + const char *dir = dirname(buffer); - std::string newfile_inplace = stringf("%s/share/%s", dirname(buffer), file.c_str()); + std::string newfile_inplace = stringf("%s/share/%s", dir, file.c_str()); if (access(newfile_inplace.c_str(), F_OK) == 0) return newfile_inplace; - std::string newfile_system = stringf("%s/../share/yosys/%s", dirname(buffer), file.c_str()); + std::string newfile_system = stringf("%s/../share/yosys/%s", dir, file.c_str()); if (access(newfile_system.c_str(), F_OK) == 0) return newfile_system;