Merge pull request #2297 from jcanizales/fix-build

Fix build breakage of moving include/grpc/ into grpc/
10 years ago · 790d7b7881
parent d1dd3a68a2 951cd18309
commit 790d7b7881
2 changed files with 4 additions and 4 deletions
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -494,9 +494,9 @@ Pod::Spec.new do |s|
    BAD_TIME="$DIR_TIME/time.h"
    GOOD_TIME="$DIR_TIME/grpc_time.h"
    grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
-    if [ -f "include/$BAD_TIME" ];
+    if [ -f "$BAD_TIME" ];
    then
-      mv -f "include/$BAD_TIME" "include/$GOOD_TIME"
+      mv -f "$BAD_TIME" "$GOOD_TIME"
    fi

    DIR_STRING="src/core/support"
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@ -111,9 +111,9 @@ Pod::Spec.new do |s|
    BAD_TIME="$DIR_TIME/time.h"
    GOOD_TIME="$DIR_TIME/grpc_time.h"
    grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
-    if [ -f "include/$BAD_TIME" ];
+    if [ -f "$BAD_TIME" ];
    then
-      mv -f "include/$BAD_TIME" "include/$GOOD_TIME"
+      mv -f "$BAD_TIME" "$GOOD_TIME"
    fi

    DIR_STRING="src/core/support"