summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2012-09-03 20:58:41 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-15 11:39:19 (GMT)
commit53adfc5f4976704d426681a0404c1643db009552 (patch)
treeff089488cc81e5323c4bc4246529df8d46718233
parent76983349cf2c77ed86e636cf81df5a61dce15a59 (diff)
downloadbuildroot-53adfc5f4976704d426681a0404c1643db009552.tar.gz
buildroot-53adfc5f4976704d426681a0404c1643db009552.tar.bz2
lua: refactor without useless define's
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/lua/lua.mk36
1 files changed, 11 insertions, 25 deletions
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 4704e4c..9e0d387 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -42,39 +42,21 @@ define HOST_LUA_BUILD_CMDS
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
endef
-define LUA_INSTALL_STAGING_SHARED_LIB
- $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
- $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
- ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
-endef
-
define LUA_INSTALL_STAGING_CMDS
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
- $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
$(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
$(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
+ $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
+ $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
+ ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
+ $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
endef
-define LUA_INSTALL_INTERPRETER
- $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
-endef
-
-define LUA_INSTALL_COMPILER
- $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
-endef
-
-define LUA_INSTALL_LIBRARY
- $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
- $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
- ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
- $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endif
-
ifeq ($(BR2_HAVE_DEVFILES),y)
define LUA_INSTALL_DEVFILES
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
@@ -86,10 +68,14 @@ define LUA_INSTALL_DEVFILES
endef
endif
+
define LUA_INSTALL_TARGET_CMDS
- $(LUA_INSTALL_INTERPRETER)
- $(LUA_INSTALL_COMPILER)
- $(LUA_INSTALL_LIBRARY)
+ $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
+ $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
+ $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
+ $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
+ ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
+ $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
$(LUA_INSTALL_DEVFILES)
endef