| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
- Date: Fri, 21 Jun 2019 14:08:38 +0200
- Subject: [PATCH] include version number
- Including it allows multiple lua versions to coexist.
- Signed-off-by: Rafał Miłecki <[email protected]>
- ---
- diff --git a/Makefile b/Makefile
- --- a/Makefile
- +++ b/Makefile
- @@ -41,10 +41,10 @@ RANLIB= ranlib
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-
- # What to install.
- -TO_BIN= lua luac
- +TO_BIN= lua$V luac$V
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
- TO_LIB= liblua.a
- -TO_MAN= lua.1 luac.1
- +TO_MAN= lua$V.1 luac$V.1
-
- # Lua version and release.
- V= 5.1
- @@ -53,7 +53,7 @@ R= 5.1.5
- all: $(PLAT)
-
- $(PLATS) clean:
- - cd src && $(MAKE) $@
- + cd src && $(MAKE) $@ V=$V
-
- test: dummy
- src/lua test/hello.lua
- diff --git a/doc/lua.1 b/doc/lua5.1.1
- rename from doc/lua.1
- rename to doc/lua5.1.1
- diff --git a/doc/luac.1 b/doc/luac5.1.1
- rename from doc/luac.1
- rename to doc/luac5.1.1
- diff --git a/src/Makefile b/src/Makefile
- --- a/src/Makefile
- +++ b/src/Makefile
- @@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
- lstrlib.o loadlib.o linit.o
-
- -LUA_T= lua
- +LUA_T= lua$V
- LUA_O= lua.o
-
- -LUAC_T= luac
- +LUAC_T= luac$V
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
|
