|
|
- commit 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80
- Author: Mike Pall <mike>
- Date: Sat Jan 25 17:37:12 2020 +0100
-
- Fix POSIX install with missing or incompatible ldconfig.
-
- --- a/Makefile
- +++ b/Makefile
- @@ -75,7 +75,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
- -LDCONFIG= ldconfig -n
- +LDCONFIG= ldconfig -n 2>/dev/null
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
- -e "s|^multilib=.*|multilib=$(MULTILIB)|"
-
- @@ -121,7 +121,7 @@ install: $(INSTALL_DEP)
- $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
- cd src && test -f $(FILE_SO) && \
- $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
- - $(LDCONFIG) $(INSTALL_LIB) && \
- + ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
|
