Merge #7788: Use relative paths instead of absolute paths in protoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-04-05 17:37:57 +02:00 committed by Alexander Block
parent d5f1b5ae88
commit 6a515e5e20

View File

@ -559,7 +559,7 @@ endif
%.pb.cc %.pb.h: %.proto %.pb.cc %.pb.h: %.proto
@test -f $(PROTOC) @test -f $(PROTOC)
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<) $(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(<D) $<
if EMBEDDED_LEVELDB if EMBEDDED_LEVELDB
include Makefile.leveldb.include include Makefile.leveldb.include