lua: choice between 5.1.x & 5.2.x

Adjust installation location to /usr.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/src/luaconf.h

===================================================================

--- a/src/luaconf.h

+++ b/src/luaconf.h

@@ -100,7 +100,7 @@

 #else			/* }{ */

 #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"

-#define LUA_ROOT	"/usr/local/"

+#define LUA_ROOT	"/usr/"

 #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR

 #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR

 #define LUA_PATH_DEFAULT  \

Add the compilation of a shared library.

Compile the lua binary with the shared library.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/src/Makefile

===================================================================

--- a/src/Makefile

+++ b/src/Makefile

@@ -29,6 +29,7 @@

 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris

 LUA_A=	liblua.a

+LUA_SO=	liblua.so

 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

@@ -43,8 +44,9 @@

 LUAC_O=	luac.o

 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)

-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)

+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)

 ALL_A= $(LUA_A)

+ALL_SO= $(LUA_SO)

 # Targets start here.

 default: $(PLAT)

@@ -55,12 +57,18 @@

 a:	$(ALL_A)

+so:	$(ALL_SO)

+

 $(LUA_A): $(BASE_O)

 	$(AR) $@ $(BASE_O)

 	$(RANLIB) $@

-$(LUA_T): $(LUA_O) $(LUA_A)

-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)

+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?

+	ln -fs $@.$(PKG_VERSION) $@

+

+$(LUA_T): $(LUA_O) $(LUA_SO)

+	$(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)

 $(LUAC_T): $(LUAC_O) $(LUA_A)

 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)