Running ldconfig shouldn't fail; so we can run fakeroot make install properly.

pull/633/head
Nicolas "Pixel" Noble 10 years ago
parent 3e9e1804c9
commit cc2b42aa96
  1. 8
      Makefile
  2. 4
      templates/Makefile.template

@ -1986,7 +1986,7 @@ endif
endif endif
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
@ -2005,7 +2005,7 @@ endif
endif endif
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
@ -2024,7 +2024,7 @@ endif
endif endif
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
@ -2035,7 +2035,7 @@ ifneq ($(PROTOBUF_DEP),)
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix) $(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
endif endif

@ -780,7 +780,7 @@ endif
% endfor % endfor
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
</%def> </%def>
@ -800,7 +800,7 @@ ifneq ($(PROTOBUF_DEP),)
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix) $(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin) ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig $(Q) ldconfig || true
endif endif
endif endif
endif endif

Loading…
Cancel
Save