| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576 |
- From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
- 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 <rafal@milecki.pl>
- ---
- diff --git a/Makefile b/Makefile
- --- a/Makefile
- +++ b/Makefile
- @@ -12,7 +12,7 @@ PLAT= none
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
- -INSTALL_INC= $(INSTALL_TOP)/include
- +INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
- @@ -39,10 +39,10 @@ RM= rm -f
- PLATS= aix bsd c89 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 lua.hpp
- -TO_LIB= liblua.a
- -TO_MAN= lua.1 luac.1
- +TO_LIB= liblua$V.a
- +TO_MAN= lua$V.1 luac$V.1
-
- # Lua version and release.
- V= 5.3
- @@ -52,7 +52,7 @@ R= $V.4
- all: $(PLAT)
-
- $(PLATS) clean:
- - cd src && $(MAKE) $@
- + cd src && $(MAKE) $@ V=$V
-
- test: dummy
- src/lua -v
- diff --git a/doc/lua.1 b/doc/lua5.3.1
- rename from doc/lua.1
- rename to doc/lua5.3.1
- diff --git a/doc/luac.1 b/doc/luac5.3.1
- rename from doc/luac.1
- rename to doc/luac5.3.1
- diff --git a/src/Makefile b/src/Makefile
- --- a/src/Makefile
- +++ b/src/Makefile
- @@ -28,7 +28,7 @@ MYOBJS=
-
- PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
-
- -LUA_A= liblua.a
- +LUA_A= liblua$V.a
- 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
- @@ -36,10 +36,10 @@ LIB_O= lauxlib.o lbaselib.o lbitlib.o lc
- lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
-
- -LUA_T= lua
- +LUA_T= lua$V
- LUA_O= lua.o
-
- -LUAC_T= luac
- +LUAC_T= luac$V
- LUAC_O= luac.o
-
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
