changes to waveform clipping display

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 60f0367764614d3420aa97dba0b227b8081ba3a9..21e534397976b39930a1e02fd8c7f3fb2dc21a55 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -38,7 +38,7 @@
 
 #include <jack/jack.h>
 
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
@@ -184,6 +184,8 @@ fixup_bundle_environment (int, char* [])
        export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
        export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 
@@ -292,6 +294,8 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
        export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 
@@ -485,7 +489,7 @@ int main (int argc, char *argv[])
        cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
-            << svn_revision
+            << revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__
 #endif