Permalink
Browse files

Fix race condition in protobuf.mak.

It was wrong of me to use a wildcard.
  • Loading branch information...
1 parent f0a4bda commit 65960f3223ca9b3de779713af9c816ecf104f773 Zack Moratto committed Mar 17, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 dist-add/thirdparty/protobuf.mak
@@ -16,7 +16,8 @@ PROTOC_ARGS =
SRC=`cd $(abs_srcdir)/$$(dirname $<) && pwd` ;\
OBJ=`cd $(abs_builddir)/$$(dirname $<) && pwd` ;\
FILENAME="$$FILEDIR/$$(basename $<)" ;\
+ PREFIX="$$(basename $< | sed 's|\(.*\)\..*|\1|g')" ;\
cd "$$SRC" && \
$(PROTOC) -I"$$SRC" -I"$$OBJ" --cpp_out="$$OBJ" $(PROTOC_ARGS) "$$FILENAME" ;\
- mv "$$OBJ"/*.pb.h $(abs_top_builddir)/include/ \
+ mv "$$OBJ"/"$$PREFIX".pb.h $(abs_top_builddir)/include/ \
)

0 comments on commit 65960f3

Please sign in to comment.