From b5a88d757874fc7b7fecb15447c52fb40930e2ca Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Sep 2020 20:05:48 +0200 Subject: Revert some of the Linux stuff from a few commits ago. This fixes startup from the source tree. --- src/lib/cross_linux.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 5c1bb7d90..0f31c108c 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -101,6 +101,11 @@ cpu_info () boost::filesystem::path resources_path () { + char* prefix = getenv ("DCPOMATIC_SHARE_PREFIX"); + if (prefix) { + return boost::filesystem::path(prefix) / "dcpomatic2"; + } + return directory_containing_executable().parent_path() / "share" / "dcpomatic2"; } @@ -108,14 +113,14 @@ resources_path () boost::filesystem::path xsd_path () { - return directory_containing_executable().parent_path() / "share" / "libdcp" / "xsd"; + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd"; } boost::filesystem::path tags_path () { - return directory_containing_executable().parent_path() / "share" / "libdcp" / "tags"; + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags"; } -- cgit v1.2.3