Merge branch 'master' into v2.1

author: Mike Pall <mike> 2020-01-25 17:38:49 +0100
committer: Mike Pall <mike> 2020-01-25 17:38:49 +0100
commit: 6d267ff6134e1c20e97cde9024e428a6d6fe0417 (patch)
tree: 3d8e91b594adb228458a52b9f3f01011e1a21a20
parent: 694d69aed910e524d4ad6ebbda7ac4e925c56202 (diff)
parent: 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 (diff)
download: luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.gz
luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.bz2
luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.zip
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 08778136..45d9f968 100644
--- 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)
author	Mike Pall <mike>	2020-01-25 17:38:49 +0100
committer	Mike Pall <mike>	2020-01-25 17:38:49 +0100
commit	6d267ff6134e1c20e97cde9024e428a6d6fe0417 (patch)
tree	3d8e91b594adb228458a52b9f3f01011e1a21a20
parent	694d69aed910e524d4ad6ebbda7ac4e925c56202 (diff)
parent	18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 (diff)
download	luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.gz luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.bz2 luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.zip

diff --git a/Makefile b/Makefile index 08778136..45d9f968 100644 --- a/Makefile +++ b/Makefile
@@ -75,7 +75,7 @@ SYMLINK= ln -sf
75	INSTALL_X= install -m 0755	75	INSTALL_X= install -m 0755
76	INSTALL_F= install -m 0644	76	INSTALL_F= install -m 0644
77	UNINSTALL= $(RM)	77	UNINSTALL= $(RM)
78	LDCONFIG= ldconfig -n	78	LDCONFIG= ldconfig -n 2>/dev/null
79	SED_PC= sed -e "s\|^prefix=.*\|prefix=$(PREFIX)\|" \	79	SED_PC= sed -e "s\|^prefix=.*\|prefix=$(PREFIX)\|" \
80	-e "s\|^multilib=.*\|multilib=$(MULTILIB)\|"	80	-e "s\|^multilib=.*\|multilib=$(MULTILIB)\|"
81		81
@@ -121,7 +121,7 @@ install: $(INSTALL_DEP)
121	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)	121	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
122	cd src && test -f $(FILE_SO) && \	122	cd src && test -f $(FILE_SO) && \
123	$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \	123	$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
124	$(LDCONFIG) $(INSTALL_LIB) && \	124	( $(LDCONFIG) $(INSTALL_LIB) \|\| : ) && \
125	$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \	125	$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
126	$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) \|\| :	126	$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) \|\| :
127	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)	127	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)