Adapt for new libdcp (fixing large compiler resource requirements).

Also adjust Linux resource-finding code to juse look for stuff
relative to the executable's location.

1 files changed, 9 insertions, 10 deletions

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 530dda027..5c1bb7d90 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -101,22 +101,21 @@ cpu_info ()
 boost::filesystem::path
 resources_path ()
 {
-	char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
-	if (p) {
-		return boost::filesystem::path(p) / "dcpomatic2";
-	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "dcpomatic2";
+	return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
 }
 
 
 boost::filesystem::path
 xsd_path ()
 {
-	char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
-	if (p) {
-		return boost::filesystem::path(p) / "libdcp" / "xsd";
-	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
+	return directory_containing_executable().parent_path() / "share" / "libdcp" / "xsd";
+}
+
+
+boost::filesystem::path
+tags_path ()
+{
+	return directory_containing_executable().parent_path() / "share" / "libdcp" / "tags";
 }