Skip to content

Commit 18c9cf7

Browse files
author
Mike Pall
committed
Fix POSIX install with missing or incompatible ldconfig.
1 parent 62903ba commit 18c9cf7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ SYMLINK= ln -sf
7474
INSTALL_X= install -m 0755
7575
INSTALL_F= install -m 0644
7676
UNINSTALL= $(RM)
77-
LDCONFIG= ldconfig -n
77+
LDCONFIG= ldconfig -n 2>/dev/null
7878
SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
7979
-e "s|^multilib=.*|multilib=$(MULTILIB)|"
8080

@@ -118,7 +118,7 @@ install: $(INSTALL_DEP)
118118
$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
119119
cd src && test -f $(FILE_SO) && \
120120
$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
121-
$(LDCONFIG) $(INSTALL_LIB) && \
121+
( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
122122
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
123123
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
124124
cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)

0 commit comments

Comments
 (0)