diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -14,7 +14,7 @@ | |||
14 | ############################################################################## | 14 | ############################################################################## |
15 | 15 | ||
16 | MAJVER= 2 | 16 | MAJVER= 2 |
17 | MINVER= 0 | 17 | MINVER= 1 |
18 | ABIVER= 5.1 | 18 | ABIVER= 5.1 |
19 | 19 | ||
20 | # LuaJIT uses rolling releases. The release version is based on the time of | 20 | # LuaJIT uses rolling releases. The release version is based on the time of |
@@ -37,12 +37,13 @@ export MULTILIB= lib | |||
37 | DPREFIX= $(DESTDIR)$(PREFIX) | 37 | DPREFIX= $(DESTDIR)$(PREFIX) |
38 | INSTALL_BIN= $(DPREFIX)/bin | 38 | INSTALL_BIN= $(DPREFIX)/bin |
39 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) | 39 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) |
40 | INSTALL_SHARE= $(DPREFIX)/share | 40 | INSTALL_SHARE_= $(PREFIX)/share |
41 | INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_) | ||
41 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) | 42 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) |
42 | INSTALL_INC= $(INSTALL_DEFINC) | 43 | INSTALL_INC= $(INSTALL_DEFINC) |
43 | 44 | ||
44 | INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) | 45 | export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION) |
45 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit | 46 | INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit |
46 | INSTALL_LMODD= $(INSTALL_SHARE)/lua | 47 | INSTALL_LMODD= $(INSTALL_SHARE)/lua |
47 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) | 48 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) |
48 | INSTALL_CMODD= $(INSTALL_LIB)/lua | 49 | INSTALL_CMODD= $(INSTALL_LIB)/lua |
@@ -71,7 +72,7 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) | |||
71 | 72 | ||
72 | INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ | 73 | INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ |
73 | $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) | 74 | $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) |
74 | UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ | 75 | UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \ |
75 | $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) | 76 | $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) |
76 | 77 | ||
77 | RM= rm -f | 78 | RM= rm -f |
@@ -95,8 +96,12 @@ FILE_SO= libluajit.so | |||
95 | FILE_MAN= luajit.1 | 96 | FILE_MAN= luajit.1 |
96 | FILE_PC= luajit.pc | 97 | FILE_PC= luajit.pc |
97 | FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h | 98 | FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h |
98 | FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \ | 99 | FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ |
99 | dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua | 100 | dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \ |
101 | dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \ | ||
102 | dis_mips64.lua dis_mips64el.lua \ | ||
103 | dis_mips64r6.lua dis_mips64r6el.lua \ | ||
104 | vmdef.lua | ||
100 | 105 | ||
101 | ifeq (,$(findstring Windows,$(OS))) | 106 | ifeq (,$(findstring Windows,$(OS))) |
102 | HOST_SYS:= $(shell uname -s) | 107 | HOST_SYS:= $(shell uname -s) |
@@ -110,6 +115,7 @@ ifeq (Darwin,$(TARGET_SYS)) | |||
110 | INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1) | 115 | INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1) |
111 | INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2) | 116 | INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2) |
112 | LDCONFIG= : | 117 | LDCONFIG= : |
118 | SED_PC+= -e "s| -Wl,-E||" | ||
113 | endif | 119 | endif |
114 | 120 | ||
115 | ############################################################################## | 121 | ############################################################################## |
@@ -126,7 +132,7 @@ install: $(INSTALL_DEP) | |||
126 | $(MKDIR) $(INSTALL_DIRS) | 132 | $(MKDIR) $(INSTALL_DIRS) |
127 | cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) | 133 | cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) |
128 | cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : | 134 | cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : |
129 | $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) | 135 | $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) |
130 | cd src && test -f $(FILE_SO) && \ | 136 | cd src && test -f $(FILE_SO) && \ |
131 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ | 137 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ |
132 | ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ | 138 | ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ |