From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/lua/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'package/lua') diff --git a/package/lua/Makefile b/package/lua/Makefile index 153d61c07..e6d250121 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= lua PKG_VERSION:= 5.1.4 PKG_RELEASE:= 2 PKG_MD5SUM:= d0870f2de55d59c1c8419f36e8fac150 -PKG_DESCR:= LUA programming language interpreter -PKG_SECTION:= lang +PKG_DESCR:= lua programming language interpreter +PKG_SECTION:= dev/lang PKG_DEPENDS:= libreadline PKG_BUILDDEP:= readline PKG_URL:= http://www.lua.org/ @@ -16,17 +16,14 @@ PKG_SITES:= http://www.lua.org/ftp/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_SUBPKGS:= LUA LUAC LUA_EXAMPLES -PKGSD_LUAC:= LUA bytecode compiler +PKG_SUBPKGS:= LUA LUAC +PKGSD_LUAC:= lua bytecode compiler PKGSN_LUAC:= lua -PKGSD_LUAEXAMPLES:= LUA script examples -PKGSN_LUAEXAMPLES:= lua include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAC},${PKG_SECTION})) -$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAEXAMPLES},${PKG_SECTION})) CONFIG_STYLE:= manual MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -DLUA_USE_LINUX -fPIC" \ @@ -45,9 +42,4 @@ luac-install: ${INSTALL_DIR} ${IDIR_LUAC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/luac ${IDIR_LUAC}/usr/bin/ -lua-examples-install: - ${INSTALL_DIR} ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples - ${INSTALL_DATA} ${WRKBUILD}/test/*.lua \ - ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples/ - include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3