summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2020-01-25 17:37:12 +0100
committerMike Pall <mike>2020-01-25 17:37:12 +0100
commit18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 (patch)
treeb656cd4f748f025aa42055f623b72e5f6ba572f7 /Makefile
parent62903bacf4abbb1c6df0f395553eeaf1f68352c6 (diff)
downloadluajit2-18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80.tar.gz
Fix POSIX install with missing or incompatible ldconfig.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 07bc70fa..bff53f28 100644
--- 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)