commit f4fb8e08c40a0160fbf37a8be9f232edfec0056a
author Nicolas Noble <nicolasnoble@users.noreply.github.com> Fri Feb 20 20:38:05 2015 -0800
committer Nicolas Noble <nicolasnoble@users.noreply.github.com> Fri Feb 20 20:38:05 2015 -0800
tree b6cb79c1314956744bcd83b69cdc8469df200e59
parent 1426a23c181d9ffd8a11e96cf2f5b5c4a1380bb2
parent 9ec95fafdce16c2fbc1ac8b598e1483340c00f6e

Merge pull request #699 from ctiller/mac3

Fix in tree build of protobuf

Makefile

diff --git a/Makefile b/Makefile
index ae5d5d4..4efb955 100644
--- a/Makefile
+++ b/Makefile
@@ -315,8 +315,8 @@
 ifeq ($(HAS_SYSTEM_PROTOBUF),false)
 ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
 PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
-CPPFLAGS += -Ithird_party/protobuf/src
-LDFLAGS += -L$(LIBDIR)/$(CONFIG)/protobuf
+CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
+LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
 PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
 else
 NO_PROTOBUF = true

templates/Makefile.template

diff --git a/templates/Makefile.template b/templates/Makefile.template
index 6041652..a93e236 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -332,8 +332,8 @@
 ifeq ($(HAS_SYSTEM_PROTOBUF),false)
 ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
 PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
-CPPFLAGS += -Ithird_party/protobuf/src
-LDFLAGS += -L$(LIBDIR)/$(CONFIG)/protobuf
+CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
+LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
 PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
 else
 NO_PROTOBUF = true