From 95e092da71c2c39e7d0972be3fb92dae1c6b2d9d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 24 May 2012 16:44:39 +0000 Subject: [PATCH] more build script cleanups git-svn-id: svn://localhost/ardour2/branches/3.0@12427 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index e90a04a534..73a6b348c7 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -87,6 +87,9 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then exit 1 fi +# Error out whenever possible +set -e + 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` echo "Version is $release_version / $svn_version" @@ -303,7 +306,7 @@ gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROO # this one is special - we will set GTK_PATH to $Libraries/clearlooks echo "Copying clearlooks ..." -cp $BUILD_ROOT/lib/clearlooks-newer/libclearlooks.so $Libraries +cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries mkdir -p $Libraries/clearlooks/engines (cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks.so . ) -- 2.30.2