| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> |
| 3 | Date: Fri, 21 Jun 2019 14:08:38 +0200 |
| 4 | Subject: [PATCH] include version number |
| 5 | |
| 6 | Including it allows multiple lua versions to coexist. |
| 7 | |
| 8 | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> |
| 9 | --- |
| 10 | |
| 11 | --- a/Makefile |
| 12 | +++ b/Makefile |
| 13 | @@ -12,7 +12,7 @@ PLAT= guess |
| 14 | # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. |
| 15 | INSTALL_TOP= /usr/local |
| 16 | INSTALL_BIN= $(INSTALL_TOP)/bin |
| 17 | -INSTALL_INC= $(INSTALL_TOP)/include |
| 18 | +INSTALL_INC= $(INSTALL_TOP)/include/lua$V |
| 19 | INSTALL_LIB= $(INSTALL_TOP)/lib |
| 20 | INSTALL_MAN= $(INSTALL_TOP)/man/man1 |
| 21 | INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V |
| 22 | @@ -39,10 +39,10 @@ RM= rm -f |
| 23 | PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris |
| 24 | |
| 25 | # What to install. |
| 26 | -TO_BIN= lua luac |
| 27 | +TO_BIN= lua$V luac$V |
| 28 | TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp |
| 29 | -TO_LIB= liblua.a |
| 30 | -TO_MAN= lua.1 luac.1 |
| 31 | +TO_LIB= liblua$V.a |
| 32 | +TO_MAN= lua$V.1 luac$V.1 |
| 33 | |
| 34 | # Lua version and release. |
| 35 | V= 5.4 |
| 36 | @@ -52,7 +52,7 @@ R= $V.6 |
| 37 | all: $(PLAT) |
| 38 | |
| 39 | $(PLATS) help test clean: |
| 40 | - @cd src && $(MAKE) $@ |
| 41 | + @cd src && $(MAKE) $@ V=$V |
| 42 | |
| 43 | install: dummy |
| 44 | cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) |
| 45 | --- a/src/Makefile |
| 46 | +++ b/src/Makefile |
| 47 | @@ -32,15 +32,15 @@ CMCFLAGS= |
| 48 | |
| 49 | PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris |
| 50 | |
| 51 | -LUA_A= liblua.a |
| 52 | +LUA_A= liblua$V.a |
| 53 | CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o |
| 54 | LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o |
| 55 | BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) |
| 56 | |
| 57 | -LUA_T= lua |
| 58 | +LUA_T= lua$V |
| 59 | LUA_O= lua.o |
| 60 | |
| 61 | -LUAC_T= luac |
| 62 | +LUAC_T= luac$V |
| 63 | LUAC_O= luac.o |
| 64 | |
| 65 | ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) |