Revert some of the Linux stuff from a few commits ago.

[dcpomatic.git] / src / lib / cross_linux.cc

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 5c1bb7d9090772d2968c95b45f77ae0bfdac7897..0f31c108cda69327f5c7e3a7c2d999afe14aebb7 100644 (file)
--- 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";
 }