X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=f2fa1293ecd3626ffd347c5efd347ccb08910252;hb=b150474b262f7c0dcf95b0d5d2b61d78e34591b0;hp=b50f67056629f870c21ab3fd306cfe21c6e17684;hpb=2dd40def0b1a334b76eb392edb9434ef64bb7bef;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index b50f670566..f2fa1293ec 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -85,7 +85,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
 fi
 
 release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"'" -f 2`
+svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d"\"" -f 2`
 echo "Version is $release_version / $svn_version"
 info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
@@ -127,7 +127,7 @@ fi
 
 # the waf build tree to use when copying built/generated files
 
-BUILD_ROOT=../../build/default
+BUILD_ROOT=../../build
 
 # setup directory structure
 
@@ -432,14 +432,14 @@ mv $Surfaces/libardourcp.so* $Libraries
 
 # MidiMaps
 # got to be careful with names here
-for x in $BUILD_ROOT/../../midi_maps/*.map ; do
+for x in $BUILD_ROOT/../midi_maps/*.map ; do
     cp "$x" $MidiMaps
     echo Copied MIDI map $x 
 done
 
 # ExportFormats
 # got to be careful with names here
-for x in $BUILD_ROOT/../../export/*.preset $BUILD_ROOT/../../export/*.format ; do
+for x in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
     cp "$x" $ExportFormats
 done
 
@@ -554,10 +554,14 @@ cp $BUILD_ROOT/gtk2_ardour/ardour3*.rc $Etc
 
 # these are copied straight from the source tree
 
+cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui_default.conf
 cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui.conf
 cp ../../instant.xml $Etc/instant.xml
 cp -r ../../gtk2_ardour/icons $Etc
 cp -r ../../gtk2_ardour/pixmaps $Etc
+cp ../../gtk2_ardour/step_editing.bindings $Etc
+cp ../../gtk2_ardour/mixer.bindings $Etc
+
 
 #
 # put sooper sekrit ingredients here and they will be copied