diff options
Diffstat (limited to 'tools/linux_packaging')
| -rw-r--r-- | tools/linux_packaging/ardour.sh.in | 7 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 3 | ||||
| -rw-r--r-- | tools/linux_packaging/noderun | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 33dfc45515..a65a85d8e9 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -31,9 +31,6 @@ if [ ! -d $USER_ARDOUR_DIR ] ; then mkdir -p $USER_ARDOUR_DIR || exit 1 fi -PATH="${BIN_DIR}:${PATH}" -export PATH - # this triggers code in main() that will reset runtime environment variables # to point to directories inside the ardour package @@ -56,9 +53,9 @@ sed "s?@ROOTDIR@/loaders?$LIB_DIR/loaders?" < $ETC_DIR/gdk-pixbuf.loaders.in > $ if [ "T" = "$DEBUG" ]; then export ARDOUR_INSIDE_GDB=1 - exec gdb $INSTALL_DIR/bin/ardour-3.0 + exec gdb $INSTALL_DIR/bin/ardour-%VER% else - exec $INSTALL_DIR/bin/ardour-3.0 $ARGS + exec $INSTALL_DIR/bin/ardour-%VER% $ARGS fi diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 26c509a1dc..2742ca9e37 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -220,8 +220,7 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour3 rm $ENVIRONMENT && chmod 775 $APPBIN/ardour3 -# the 3.0 here is not the same as "release-version" because the latter may include "-betaN" etc. -MAIN_EXECUTABLE=ardour-3.0 +MAIN_EXECUTABLE=ardour-${release_version} echo "Copying ardour executable ...." cp $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN diff --git a/tools/linux_packaging/noderun b/tools/linux_packaging/noderun index b092abd5ca..a6357ef488 100644 --- a/tools/linux_packaging/noderun +++ b/tools/linux_packaging/noderun @@ -11,10 +11,10 @@ fi cd $BASE || exit 1 git pull || exit 1 -./waf configure $* --strict --backtrace --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1 +./waf configure $* --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1 ./waf || exit 1 cd tools/linux_packaging || exit 1 -./build --public --strip some || exit 1 +./build --public --harvid --strip some || exit 1 ./package --public --singlearch || exit 1 file=`ls -t *.tar` echo "Copying $file to shared folder ..." |