diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 24 |
1 files changed, 16 insertions, 8 deletions
@@ -14,9 +14,10 @@ | |||
14 | ############################################################################## | 14 | ############################################################################## |
15 | 15 | ||
16 | MAJVER= 2 | 16 | MAJVER= 2 |
17 | MINVER= 0 | 17 | MINVER= 1 |
18 | RELVER= 4 | 18 | RELVER= 0 |
19 | VERSION= $(MAJVER).$(MINVER).$(RELVER) | 19 | PREREL= -beta2 |
20 | VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) | ||
20 | ABIVER= 5.1 | 21 | ABIVER= 5.1 |
21 | 22 | ||
22 | ############################################################################## | 23 | ############################################################################## |
@@ -84,8 +85,9 @@ FILE_SO= libluajit.so | |||
84 | FILE_MAN= luajit.1 | 85 | FILE_MAN= luajit.1 |
85 | FILE_PC= luajit.pc | 86 | FILE_PC= luajit.pc |
86 | FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h | 87 | FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h |
87 | FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \ | 88 | FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ |
88 | dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua | 89 | dis_x86.lua dis_x64.lua dis_arm.lua dis_ppc.lua \ |
90 | dis_mips.lua dis_mipsel.lua vmdef.lua | ||
89 | 91 | ||
90 | ifeq (,$(findstring Windows,$(OS))) | 92 | ifeq (,$(findstring Windows,$(OS))) |
91 | HOST_SYS:= $(shell uname -s) | 93 | HOST_SYS:= $(shell uname -s) |
@@ -115,7 +117,7 @@ install: $(INSTALL_DEP) | |||
115 | $(MKDIR) $(INSTALL_DIRS) | 117 | $(MKDIR) $(INSTALL_DIRS) |
116 | cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) | 118 | cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) |
117 | cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : | 119 | cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : |
118 | $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) | 120 | $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) |
119 | cd src && test -f $(FILE_SO) && \ | 121 | cd src && test -f $(FILE_SO) && \ |
120 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ | 122 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ |
121 | $(LDCONFIG) $(INSTALL_LIB) && \ | 123 | $(LDCONFIG) $(INSTALL_LIB) && \ |
@@ -127,12 +129,18 @@ install: $(INSTALL_DEP) | |||
127 | $(RM) $(FILE_PC).tmp | 129 | $(RM) $(FILE_PC).tmp |
128 | cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) | 130 | cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) |
129 | cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) | 131 | cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) |
130 | $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM) | ||
131 | @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" | 132 | @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" |
133 | @echo "" | ||
134 | @echo "Note: the development releases deliberately do NOT install a symlink for luajit" | ||
135 | @echo "You can do this now by running this command (with sudo):" | ||
136 | @echo "" | ||
137 | @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)" | ||
138 | @echo "" | ||
139 | |||
132 | 140 | ||
133 | uninstall: | 141 | uninstall: |
134 | @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" | 142 | @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" |
135 | $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC) | 143 | $(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC) |
136 | for file in $(FILES_JITLIB); do \ | 144 | for file in $(FILES_JITLIB); do \ |
137 | $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \ | 145 | $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \ |
138 | done | 146 | done |