summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-10-31 15:26:29 +0100
committerRobin Gareus <robin@gareus.org>2017-10-31 15:26:29 +0100
commit8e8168547bef7e404f70916fa3838cbe5c15bc62 (patch)
tree4ce1c6a51b720138387e0c564f5de919b14507a4
parent3b785b9d357b9c929ba061b306eacf2247737091 (diff)
Fix NSM for distro-builds (waf install)
-rw-r--r--gtk2_ardour/ardour.sh.in2
-rw-r--r--gtk2_ardour/ardour_ui.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 407c808a0e..56555293a9 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -51,7 +51,7 @@ export ARDOUR_DLL_PATH=@LIBDIR@
# NSM needs a path to this script
#
-export ARDOUR_SELF="$0"
+export ARDOUR_SELF=$(basename "$0")
#
# VAMP has its own lookup path
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 3e7cba0c9a..c61afb20de 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1107,7 +1107,7 @@ ARDOUR_UI::starting ()
* The wrapper startup script should set the environment variable 'ARDOUR_SELF'
*/
const char *process_name = g_getenv ("ARDOUR_SELF");
- nsm->announce (PROGRAM_NAME, ":dirty:", process_name ? process_name : "ardour4");
+ nsm->announce (PROGRAM_NAME, ":dirty:", process_name ? process_name : "ardour6");
unsigned int i = 0;
// wait for announce reply from nsm server