From 310b0ed233439913dc66205a7fdbbe5dc9e3e774 Mon Sep 17 00:00:00 2001 From: Deepak Jois Date: Fri, 22 Apr 2016 22:24:37 +0530 Subject: [PATCH] Use builtin build method. Fix #1. --- .gitignore | 2 +- Makefile | 12 +----------- luaucdn-0.0.1-0.rockspec => luaucdn-0.0.2-0.rockspec | 12 ++++++------ 3 files changed, 8 insertions(+), 18 deletions(-) rename luaucdn-0.0.1-0.rockspec => luaucdn-0.0.2-0.rockspec (66%) diff --git a/.gitignore b/.gitignore index b2dffea..0eb94aa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ luacov.report.out luacov.stats.out .luacheckcache api -*.src.rock +*.rock diff --git a/Makefile b/Makefile index 6b0f8d6..71e6dda 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,6 @@ else LIBFLAGS = -shared endif -# For compatibility with Luarocks -INST_PREFIX = /usr/local -INST_LIBDIR = $(INST_PREFIX)/lib/lua/5.2 -INST_LUADIR = $(INST_PREFIX)/share/lua/5.2 - DOCS_DIR := api BUILD_DIR := build C_SRC_ROOT := src/luaucdn @@ -44,9 +39,4 @@ lint: doc: ldoc -d ${DOCS_DIR} . -# For use with Luarocks -install: luaucdn.so src/ucdn.lua - cp luaucdn.so $(INST_LIBDIR) - cp src/ucdn.lua $(INST_LUADIR) - -.PHONY: all clean test dirs install lint spec doc +.PHONY: all clean test dirs lint spec doc diff --git a/luaucdn-0.0.1-0.rockspec b/luaucdn-0.0.2-0.rockspec similarity index 66% rename from luaucdn-0.0.1-0.rockspec rename to luaucdn-0.0.2-0.rockspec index 506211a..3ad8f33 100644 --- a/luaucdn-0.0.1-0.rockspec +++ b/luaucdn-0.0.2-0.rockspec @@ -1,8 +1,8 @@ package = "luaucdn" -version = "0.0.1-0" +version = "0.0.2-0" source = { url = "git://github.com/deepakjois/luaucdn", - tag = "v0.0.1" + tag = "v0.0.2" } description = { summary = "Lua bindings for ucdn", @@ -14,9 +14,9 @@ dependencies = { "lua ~> 5.2" } build = { - type = "make", - install_variables = { - INST_LIBDIR="$(LIBDIR)", - INST_LUADIR="$(LUADIR)", + type = "builtin", + modules = { + ucdn = "src/ucdn.lua", + luaucdn = {"src/luaucdn/ucdn.c", "src/luaucdn/luaucdn.c"} } }