1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1c619c70..d789e9f3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 ##############################################################################
 MAJVER=  2
-MINVER=  0
+MINVER=  1
 ABIVER=  5.1
 # LuaJIT uses rolling releases. The release version is based on the time of
@@ -37,12 +37,13 @@ export MULTILIB= lib
 DPREFIX= $(DESTDIR)$(PREFIX)
 INSTALL_BIN=   $(DPREFIX)/bin
 INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
-INSTALL_SHARE= $(DPREFIX)/share
+INSTALL_SHARE_= $(PREFIX)/share
+INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
 INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
 INSTALL_INC=   $(INSTALL_DEFINC)
-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
+export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
-INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
 INSTALL_LMODD= $(INSTALL_SHARE)/lua
 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
 INSTALL_CMODD= $(INSTALL_LIB)/lua
@@ -71,7 +72,7 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
 INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
-UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \
  $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
 RM= rm -f
@@ -95,8 +96,12 @@ FILE_SO= libluajit.so
 FILE_MAN= luajit.1
 FILE_PC= luajit.pc
 FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
-FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \
+FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
-              dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua
+              dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
+              dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
+              dis_mips64.lua dis_mips64el.lua \
+              dis_mips64r6.lua dis_mips64r6el.lua \
+              vmdef.lua
 ifeq (,$(findstring Windows,$(OS)))
  HOST_SYS:= $(shell uname -s)
@@ -110,6 +115,7 @@ ifeq (Darwin,$(TARGET_SYS))
  INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1)
  INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2)
  LDCONFIG= :
+  SED_PC+= -e "s| -Wl,-E||"
 endif
 ##############################################################################
@@ -126,7 +132,7 @@ install: $(INSTALL_DEP)
        $(MKDIR) $(INSTALL_DIRS)
        cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
        cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :
-        $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+        $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
        cd src && test -f $(FILE_SO) && \
          $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
          ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \