1 files changed, 16 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index eb9572d8..6dfbbde4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@
 ##############################################################################
 
 MAJVER=  2
-MINVER=  0
-RELVER=  4
-VERSION= $(MAJVER).$(MINVER).$(RELVER)
+MINVER=  1
+RELVER=  0
+PREREL=  -beta2
+VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
 ABIVER=  5.1
 
 ##############################################################################
@@ -84,8 +85,9 @@ 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 \
-              dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua
+FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
+              dis_x86.lua dis_x64.lua dis_arm.lua dis_ppc.lua \
+              dis_mips.lua dis_mipsel.lua vmdef.lua
 
 ifeq (,$(findstring Windows,$(OS)))
   HOST_SYS:= $(shell uname -s)
@@ -115,7 +117,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) && \
@@ -127,12 +129,18 @@ install: $(INSTALL_DEP)
           $(RM) $(FILE_PC).tmp
         cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
         cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
-        $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
         @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
+        @echo ""
+        @echo "Note: the development releases deliberately do NOT install a symlink for luajit"
+        @echo "You can do this now by running this command (with sudo):"
+        @echo ""
+        @echo "  $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
+        @echo ""
+
 
 uninstall:
         @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
-        $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
+        $(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
         for file in $(FILES_JITLIB); do \
           $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
           done