| 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 | @@ -41,10 +41,10 @@ RANLIB= ranlib |
| 14 | PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris |
| 15 | |
| 16 | # What to install. |
| 17 | -TO_BIN= lua luac |
| 18 | +TO_BIN= lua$V luac$V |
| 19 | TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp |
| 20 | TO_LIB= liblua.a |
| 21 | -TO_MAN= lua.1 luac.1 |
| 22 | +TO_MAN= lua$V.1 luac$V.1 |
| 23 | |
| 24 | # Lua version and release. |
| 25 | V= 5.1 |
| 26 | @@ -53,7 +53,7 @@ R= 5.1.5 |
| 27 | all: $(PLAT) |
| 28 | |
| 29 | $(PLATS) clean: |
| 30 | - cd src && $(MAKE) $@ |
| 31 | + cd src && $(MAKE) $@ V=$V |
| 32 | |
| 33 | test: dummy |
| 34 | src/lua test/hello.lua |
| 35 | diff --git a/doc/lua.1 b/doc/lua5.1.1 |
| 36 | rename from doc/lua.1 |
| 37 | rename to doc/lua5.1.1 |
| 38 | diff --git a/doc/luac.1 b/doc/luac5.1.1 |
| 39 | rename from doc/luac.1 |
| 40 | rename to doc/luac5.1.1 |
| 41 | diff --git a/src/Makefile b/src/Makefile |
| 42 | --- a/src/Makefile |
| 43 | +++ b/src/Makefile |
| 44 | @@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ld |
| 45 | LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ |
| 46 | lstrlib.o loadlib.o linit.o |
| 47 | |
| 48 | -LUA_T= lua |
| 49 | +LUA_T= lua$V |
| 50 | LUA_O= lua.o |
| 51 | |
| 52 | -LUAC_T= luac |
| 53 | +LUAC_T= luac$V |
| 54 | LUAC_O= luac.o print.o |
| 55 | |
| 56 | ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) |