Skip to content
Snippets Groups Projects
Commit cc3e6135 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge pull request #687 from nicolasnoble/no-install-protobuf

Let's not install our potentially broken version of protobuf onto the system and pollute people's environment.
parents a63ea02f 36a6e18b
No related branches found
No related tags found
No related merge requests found
......@@ -714,7 +714,7 @@ $(OBJDIR)/$(CONFIG)/%.o : %.cc
$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
install: install_c install_cxx install-protobuf install-plugins
install: install_c install_cxx install-plugins
install_c: install-headers_c install-static_c install-shared_c
......@@ -790,17 +790,6 @@ ${install_shared("c++")}
install-shared_csharp: shared_csharp strip-shared_csharp
${install_shared("csharp")}
install-protobuf: $(PROTOBUF_DEP)
ifneq ($(PROTOBUF_DEP),)
$(E) "[INSTALL] Installing embedded protobufs"
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig || true
endif
endif
endif
install-plugins: $(PROTOC_PLUGINS)
ifeq ($(SYSTEM),MINGW32)
$(Q) false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment