Prefer the tags directory specified in LIBDCP_RESOURCES

diff --git a/src/util.cc b/src/util.cc
index 0b011bf971408183ac227288cc6b4b1292dbb473..5133a43bac8dc83fcc76ac46313cb50a0c8b0e97 100644 (file)
--- a/src/util.cc
+++ b/src/util.cc
@@ -453,16 +453,17 @@ boost::filesystem::path dcp::directory_containing_executable ()
 
 boost::filesystem::path dcp::resources_directory ()
 {
-#if defined(LIBDCP_OSX)
-       return directory_containing_executable().parent_path() / "Resources";
-#elif defined(LIBDCP_WINDOWS)
-       return directory_containing_executable().parent_path();
-#else
        /* We need a way to specify the tags directory for running un-installed binaries */
        char* prefix = getenv("LIBDCP_RESOURCES");
        if (prefix) {
                return prefix;
        }
+
+#if defined(LIBDCP_OSX)
+       return directory_containing_executable().parent_path() / "Resources";
+#elif defined(LIBDCP_WINDOWS)
+       return directory_containing_executable().parent_path();
+#else
        return directory_containing_executable().parent_path() / "share" / "libdcp";
 #endif
 }