From 2d8a54477fe2d20008a7649599e3bd99419e78d7 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 20 Dec 2016 10:25:11 -0800 Subject: Updated Makefile.am to fix out-of-tree builds --- src/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7f7c1c90..37204ea0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -495,8 +495,10 @@ js_well_known_types_sources = \ google/protobuf/compiler/js/well_known_types/any.js \ google/protobuf/compiler/js/well_known_types/struct.js \ google/protobuf/compiler/js/well_known_types/timestamp.js +# We have to cd to $(srcdir) so that out-of-tree builds work properly. google/protobuf/compiler/js/well_known_types_embed.cc: js_embed$(EXEEXT) $(js_well_known_types_sources) - ./js_embed$(EXEEXT) $(js_well_known_types_sources) > $@ + oldpwd=`pwd` && cd $(srcdir) && \ + $$oldpwd/js_embed$(EXEEXT) $(js_well_known_types_sources) > $$oldpwd/$@ # Tests ============================================================== @@ -550,6 +552,7 @@ protoc_inputs = \ EXTRA_DIST = \ $(protoc_inputs) \ + $(js_well_known_types_sources) \ solaris/libstdc++.la \ google/protobuf/io/gzip_stream.h \ google/protobuf/io/gzip_stream_unittest.sh \ -- cgit v1.2.3