From 36a6e18b4efda7d03075f001d4580f477bef5542 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sat, 21 Feb 2015 02:21:50 +0100
Subject: [PATCH] Let's not install our potentially broken version of protobuf
onto the system and pollute people's environment.
---
templates/Makefile.template | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 85da0dd892..1503281fb1 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -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
--
GitLab