Skip to content
Snippets Groups Projects
Commit cc2b42aa authored by Nicolas "Pixel" Noble's avatar Nicolas "Pixel" Noble
Browse files

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

parent 3e9e1804
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 4
− 4
View file @ cc2b42aa
...@@ -1986,7 +1986,7 @@ endif ...@@ -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 ...@@ -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 ...@@ -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),) ...@@ -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
templates/Makefile.template
+ 2
− 2
View file @ cc2b42aa
...@@ -780,7 +780,7 @@ 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),) ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment