X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fmake_linux_package.sh;h=6598936a6b253cb5bc5d6923de01f333bce735a6;hb=c201f368c592508e8f2289c3f0f19e681db153a3;hp=fef0254b7043bcc46251b5f95e4d15a2329ae505;hpb=440a53f85965f35cd7bc401ef7e3fb9c4dfd1390;p=apps%2Fagl-service-can-low-level.git

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index fef0254b..6598936a 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -6,7 +6,7 @@
 set -e
 set -x
 
-VERSION=`git describe --always`
+VERSION=`git describe --always`-linux-x86
 DEST=dist/$VERSION
 
 rm -rf $DEST
@@ -31,13 +31,14 @@ rm $DEST/generator/protoc-gen-nanopb.py
 # Package the protoc compiler
 cp `which protoc` $DEST/generator-bin/protoc.bin
 LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*')
-cp $LIBPROTOC $DEST/generator-bin/
+LIBPROTOBUF=$(ldd `which protoc` | grep -o '/.*libprotobuf[^ ]*')
+cp $LIBPROTOC $LIBPROTOBUF $DEST/generator-bin/
 cat > $DEST/generator-bin/protoc << EOF
 #!/bin/bash
-SCRIPTDIR=\$(dirname \$(readlink -f \$0))
+SCRIPTDIR=\$(dirname "\$0")
 export LD_LIBRARY_PATH=\$SCRIPTDIR
 export PATH=\$SCRIPTDIR:\$PATH
-exec \$SCRIPTDIR/protoc.bin "\$@"
+exec "\$SCRIPTDIR/protoc.bin" "\$@"
 EOF
 chmod +x $DEST/generator-bin/protoc