summaryrefslogtreecommitdiff
path: root/tools/linux_packaging/package
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-03-22 16:54:06 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-03-22 16:54:06 -0400
commite155338aa06ab9d449f9c4fe5f4f654066784e6f (patch)
tree4a46389f321a5697e92fd02b234c694919212945 /tools/linux_packaging/package
parentd99b5dfa37c7248e24a0266188752dfa6c9bb3f6 (diff)
change extraction of revision and build from revision.cc, and use in the build, package and uninstall scripts
Diffstat (limited to 'tools/linux_packaging/package')
-rwxr-xr-xtools/linux_packaging/package6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 85cac2ed98..4862f285ab 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -63,10 +63,10 @@ if [ x$DEBUG = xT ]; then
fi
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
-X86_BUNDLE="${APPNAME}_x86-${release_version}_${revision}"
-X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${revision}"
+X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}"
+X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"
if [ ! -z ${BUILDTYPE} ]; then
X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}"