diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-29 01:58:47 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-29 01:58:47 +0000 |
commit | 03fe5aa56d28e1158eb92c0ee163d2a1b3a20a97 (patch) | |
tree | b93ff27a23ee14043895ecd807a02e0ef751b2e1 /gtk2_ardour | |
parent | 9f3f3738e7444ee365a77277b1237b1b35786a7e (diff) |
safe use of existing env vars
git-svn-id: svn://localhost/ardour2/branches/3.0@7856 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 4 | ||||
-rw-r--r-- | gtk2_ardour/ardour.sh.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 1aef253d09..2ff8d07068 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -14,9 +14,9 @@ else export GTK_PATH=~/.ardour3:$libs/clearlooks-older fi -export VAMP_PATH=$libs/vamp-plugins:$VAMP_PATH +export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH} -export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index ec01615b5e..63768e7344 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -1,8 +1,8 @@ #!/bin/sh -export GTK_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$GTK_PATH +export GTK_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH} -export LD_LIBRARY_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for Darwin export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH |