diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-02-19 16:19:43 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-02-19 16:19:43 -0800 |
| commit | 6d96a03b73f1102e454b633f679038c6b146d4ec (patch) | |
| tree | 28881a0c6a245bfe2e0fff7253e80ed3ae327578 | |
| parent | f4ce945da523f66330fb5df817bcee73013d9589 (diff) | |
| parent | cc2b42aa96e33dfd5fdc10400858f898246dd94f (diff) | |
Merge pull request #633 from nicolasnoble/ldconfig
Running ldconfig shouldn't fail; so we can run fakeroot make install properly.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | templates/Makefile.template | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -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 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 </%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 |