cleanup lua targets

diff --git a/make/libraries.mk b/make/libraries.mk
index 0c77b15e6feec665cbf4bdc816754fa5003e2b3c..1adc12577b4c697aa9c13461b90c30d4a3e9e680 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -628,18 +628,18 @@ $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGETPR
                        $(MAKE); \
                        LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
                        LUA_LMOD=/share/lua/$(LUA_ABIVER) \
-                       $(MAKE) DESTDIR=$(TARGETPREFIX)
+                       $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(TARGET)-strip $(TARGETPREFIX)/lib/lua/$(LUA_ABIVER)/lcurl.so
        $(REMOVE)/Lua-cURL$(LUACURL_VER)
        touch $@
 
-$(D)/luaposix: $(HOSTPREFIX)/bin/lua-5.2.3 $(D)/lua $(ARCHIVE)/luaposix-31.tar.gz $(ARCHIVE)/slingshot-v6.tar.gz | $(TARGETPREFIX)
+$(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(ARCHIVE)/luaposix-31.tar.gz $(ARCHIVE)/slingshot-v6.tar.gz | $(TARGETPREFIX)
        $(UNTAR)/luaposix-31.tar.gz
        tar -C $(BUILD_TMP)/luaposix-31/slingshot --strip=1 -xf $(ARCHIVE)/slingshot-v6.tar.gz
        set -e; cd $(BUILD_TMP)/luaposix-31; \
                $(PATCH)/luaposix-fix-build.patch; \
                $(PATCH)/luaposix-fix-docdir-build.patch; \
-               export LUA=$(HOSTPREFIX)/bin/lua-5.2.3; \
+               export LUA=$(HOSTPREFIX)/bin/lua-$(LUA_VER); \
                ./bootstrap; \
                autoreconf -fi; \
                $(CONFIGURE) --prefix= \
@@ -656,28 +656,28 @@ $(D)/luaposix: $(HOSTPREFIX)/bin/lua-5.2.3 $(D)/lua $(ARCHIVE)/luaposix-31.tar.g
        touch $@
 
 # helper for luaposix build
-$(HOSTPREFIX)/bin/lua-5.2.3: $(ARCHIVE)/lua-5.2.3.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/lua-5.2.3.tar.gz
-       set -e; cd $(BUILD_TMP)/lua-5.2.3; \
+$(HOSTPREFIX)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
+       $(UNTAR)/lua-$(LUA_VER).tar.gz
+       set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \
                $(PATCH)/lua-01-fix-coolstream-build.patch; \
                $(MAKE) linux
-       install -m 0755 -D $(BUILD_TMP)/lua-5.2.3/src/lua $@
-       $(REMOVE)/lua-5.2.3 $(TARGETPREFIX)/.remove
+       install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/lua $@
+       $(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
 
-$(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-5.2.3.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/lua-5.2.3.tar.gz
-       set -e; cd $(BUILD_TMP)/lua-5.2.3; \
+$(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
+       $(UNTAR)/lua-$(LUA_VER).tar.gz
+       set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \
                $(PATCH)/lua-01-fix-coolstream-build.patch; \
                $(PATCH)/lua-02-shared-libs-for-lua.patch; \
                $(PATCH)/lua-03-lua-pc.patch; \
                $(PATCH)/lua-04-lua-lvm.c.patch; \
-               $(MAKE) linux PKG_VERSION=5.2.3 CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="-L$(TARGETPREFIX)/lib"; \
+               $(MAKE) linux PKG_VERSION=$(LUA_VER) CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="-L$(TARGETPREFIX)/lib"; \
                $(MAKE) install INSTALL_TOP=$(TARGETPREFIX)
-       install -m 0755 -D $(BUILD_TMP)/lua-5.2.3/src/liblua.so.5.2.3 $(TARGETPREFIX)/lib/liblua.so.5.2.3
-       cd $(TARGETPREFIX)/lib; ln -sf liblua.so.5.2.3 $(TARGETPREFIX)/lib/liblua.so
-       install -m 0644 -D $(BUILD_TMP)/lua-5.2.3/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
+       install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so.$(LUA_VER)
+       cd $(TARGETPREFIX)/lib; ln -sf liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so
+       install -m 0644 -D $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc
        rm -rf $(TARGETPREFIX)/bin/lua
        rm -rf $(TARGETPREFIX)/bin/luac
-       $(REMOVE)/lua-5.2.3 $(TARGETPREFIX)/.remove
+       $(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
        touch $@