]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Fix POSIX install with missing or incompatible ldconfig.
authorMike Pall <mike>
Sat, 25 Jan 2020 16:37:12 +0000 (17:37 +0100)
committerMike Pall <mike>
Sat, 25 Jan 2020 16:37:12 +0000 (17:37 +0100)
Makefile

index 07bc70faf4a3925db6f7026446d96164cb3c07ed..bff53f2867bb40af930d810a34b1e491b06cc12d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,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)|"
 
@@ -118,7 +118,7 @@ install: $(INSTALL_DEP)
        $(RM) $(INSTALL_TSYM) $(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)