tweaks to packaging to make SUIL (and thus LV2 UI's) work

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 23b33c4e27e596f0264caa2ddd097efbf4b4bcf4..463fb704828a7e3c54f3eddef4bdc65919c211da 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -166,7 +166,7 @@ fixup_bundle_environment (int, char* [])
        }
        setenv ("PATH", path.c_str(), 1);
 
-       export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../Frameworks");
+       export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../lib");
 
        path += dir_path;
        path += "/../Resources";
@@ -182,10 +182,11 @@ fixup_bundle_environment (int, char* [])
        export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources");
 
        export_search_path (dir_path, "LADSPA_PATH", "/../Plugins");
-       export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
+       export_search_path (dir_path, "VAMP_PATH", "/../lib");
+       export_search_path (dir_path, "SUIL_MODULE_DIR", "/../lib");
 
        path = dir_path;
-       path += "/../Frameworks/clearlooks";
+       path += "/../lib/clearlooks";
        setenv ("GTK_PATH", path.c_str(), 1);
 
        /* unset GTK_RC_FILES so that we only load the RC files that we define
@@ -262,7 +263,7 @@ fixup_bundle_environment (int, char* [])
                // JACK driver dir
 
                path = dir_path;
-               path += "/../Frameworks";
+               path += "/../lib";
 
                setenv ("JACK_DRIVER_DIR", path.c_str(), 1);
        }
@@ -298,6 +299,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 
        export_search_path (dir_path, "LADSPA_PATH", "/../plugins");
        export_search_path (dir_path, "VAMP_PATH", "/lib");
+       export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
 
        path = dir_path;
        path += "/lib/clearlooks";