From 4eedc0eabd87d6482d586a04db710409134e562d Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Fri, 12 Aug 2016 15:46:08 +0300 Subject: [PATCH] proto: fix for make file, add paths to .gitignore --- .gitignore | 3 +++ proto/pre-build.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d16fad24508..40adbe96aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ lib/ .idea/ proto/compiler/protoc-artifacts proto/compiler/tests + +proto/compiler/google/src/google/protobuf/compiler/kotlin/bin +proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc diff --git a/proto/pre-build.sh b/proto/pre-build.sh index 0b0c4026a28..4902abd87fe 100755 --- a/proto/pre-build.sh +++ b/proto/pre-build.sh @@ -42,12 +42,12 @@ if [ "$ok" == 0 ]; then make echo "Installing" - #sudo make install + sudo make install echo "Cleaning" - cd ../.. - rm -rf protobuf_sources + # cd ../.. + # rm -rf protobuf_sources fi else echo "Prerequisites met, you can build library now via Makefile" -fi \ No newline at end of file +fi