aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2020-01-25 17:38:49 +0100
committerMike Pall <mike>2020-01-25 17:38:49 +0100
commit6d267ff6134e1c20e97cde9024e428a6d6fe0417 (patch)
tree3d8e91b594adb228458a52b9f3f01011e1a21a20 /Makefile
parent694d69aed910e524d4ad6ebbda7ac4e925c56202 (diff)
parent18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 (diff)
downloadluajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.gz
luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.tar.bz2
luajit-6d267ff6134e1c20e97cde9024e428a6d6fe0417.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
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
75INSTALL_X= install -m 0755 75INSTALL_X= install -m 0755
76INSTALL_F= install -m 0644 76INSTALL_F= install -m 0644
77UNINSTALL= $(RM) 77UNINSTALL= $(RM)
78LDCONFIG= ldconfig -n 78LDCONFIG= ldconfig -n 2>/dev/null
79SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ 79SED_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)