diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
commit | 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 (patch) | |
tree | 29aa92a68feb1557c60500969d6d5aeade6a2e9b /gtk2_ardour/ardour.sh.in | |
parent | 433b6651ee8450da8282330ac35cb7ec1abbab6f (diff) |
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.sh.in')
-rw-r--r-- | gtk2_ardour/ardour.sh.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index d7297fd77c..45fdb6f55e 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -1,10 +1,13 @@ #!/bin/sh -export GTK_PATH=@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH} +# +# This script runs an installed version of Ardour. It sets a few environment variables +# and does a few checks before exec'ing the real executable. +# + +export GTK_PATH=@SYSCONFDIR@/ardour3${GTK_PATH:+:$GTK_PATH} export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -# DYLD_LIBRARY_PATH is for Darwin -export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH ## Memlock check @@ -36,6 +39,14 @@ elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | echo "" fi +# +# Running Ardour requires these 3 variables to be set +# + +export ARDOUR_DATA_PATH=@DATADIR@/ardour3 +export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3 +export ARDOUR_DLL_PATH=@LIBDIR@/ardour3 + exec @LIBDIR@/ardour3/ardour-@VERSION@ "$@" |