From cc2b42aa96e33dfd5fdc10400858f898246dd94f Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 20 Feb 2015 00:42:21 +0100 Subject: Running ldconfig shouldn't fail; so we can run fakeroot make install properly. --- Makefile | 8 ++++---- templates/Makefile.template | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 91c94c8071..90cd4ffa64 100644 --- a/Makefile +++ b/Makefile @@ -1986,7 +1986,7 @@ endif endif ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif @@ -2005,7 +2005,7 @@ endif endif ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif @@ -2024,7 +2024,7 @@ endif endif ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif @@ -2035,7 +2035,7 @@ ifneq ($(PROTOBUF_DEP),) $(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix) ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif endif diff --git a/templates/Makefile.template b/templates/Makefile.template index b302623cd9..dead8b8d66 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -780,7 +780,7 @@ endif % endfor ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif @@ -800,7 +800,7 @@ ifneq ($(PROTOBUF_DEP),) $(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix) ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) - $(Q) ldconfig + $(Q) ldconfig || true endif endif endif -- cgit v1.2.3