smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix paths in ardour.sh

Browse source
This commit is contained in:
Tim Mayberry 2014-06-03 22:27:36 +10:00
parent cd57e14cf3
commit 7ba3e50e51
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/ardour.sh.in
View file

@ -5,9 +5,9 @@
# and does a few checks before exec'ing the real executable. # and does a few checks before exec'ing the real executable.
# #
export GTK_PATH=@SYSCONFDIR@/ardour3:@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH} export GTK_PATH=@CONFDIR@:@LIBDIR@${GTK_PATH:+:$GTK_PATH}
export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
## Memlock check ## Memlock check
@ -23,7 +23,7 @@ fi
## Glib atomic test ## Glib atomic test
GLIB=$(ldd @LIBDIR@/ardour3/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/') GLIB=$(ldd @LIBDIR@/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
if [ "$GLIB" = "" ]; then if [ "$GLIB" = "" ]; then
echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations." echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
@ -43,15 +43,15 @@ fi
# Running Ardour requires these 3 variables to be set # Running Ardour requires these 3 variables to be set
# #
export ARDOUR_DATA_PATH=@DATADIR@/ardour3 export ARDOUR_DATA_PATH=@DATADIR@
export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3 export ARDOUR_CONFIG_PATH=@CONFDIR@
export ARDOUR_DLL_PATH=@LIBDIR@/ardour3 export ARDOUR_DLL_PATH=@LIBDIR@
# #
# VAMP has its own lookup path # VAMP has its own lookup path
# #
export VAMP_PATH=@LIBDIR@/ardour3/vamp export VAMP_PATH=@LIBDIR@/vamp
if [ $# -gt 0 ] ; then if [ $# -gt 0 ] ; then
case $1 in case $1 in
@ -59,6 +59,6 @@ if [ $# -gt 0 ] ; then
esac esac
fi fi
exec $GDB @LIBDIR@/ardour3/ardour-@VERSION@ "$@" exec $GDB @LIBDIR@/ardour-@VERSION@ "$@"

2
gtk2_ardour/wscript
View file

@ -483,7 +483,7 @@ def build(bld):
'INSTALL_PREFIX' : bld.env['PREFIX'], 'INSTALL_PREFIX' : bld.env['PREFIX'],
'LIBDIR' : os.path.normpath(bld.env['DLLDIR']), 'LIBDIR' : os.path.normpath(bld.env['DLLDIR']),
'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']),
'SYSCONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']),
'LIBS' : 'build/libs', 'LIBS' : 'build/libs',
'VERSION' : bld.env['VERSION'], 'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']