Skip to content
Snippets Groups Projects
Commit 6d96a03b authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #633 from nicolasnoble/ldconfig

Running ldconfig shouldn't fail; so we can run fakeroot make install properly.
parents f4ce945d cc2b42aa
No related branches found
No related tags found
No related merge requests found
......@@ -1987,7 +1987,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig
$(Q) ldconfig || true
endif
endif
 
......@@ -2006,7 +2006,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig
$(Q) ldconfig || true
endif
endif
 
......@@ -2025,7 +2025,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig
$(Q) ldconfig || true
endif
endif
 
......@@ -2036,7 +2036,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
......@@ -780,7 +780,7 @@ endif
% endfor
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
$(Q) ldconfig
$(Q) ldconfig || true
endif
endif
</%def>
......@@ -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
......
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