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

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 342029aa..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,16 +31,17 @@ 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
 
 # Tar it all up
-( cd dist; tar -czf $VERSION-linux.tar.gz $VERSION )
+( cd dist; tar -czf $VERSION.tar.gz $VERSION )