diff --git a/.github/rockspec.template b/.github/rockspec.template index 62127d2..01abbe5 100644 --- a/.github/rockspec.template +++ b/.github/rockspec.template @@ -36,8 +36,10 @@ build = { copy_directories = $copy_directories, build_variables = { LUA_INCDIR="$(LUA_INCDIR)", + LIBFLAG="$(LIBFLAG)", }, install_variables = { + WRAP = "false", LIBDIR="$(LIBDIR)", BINDIR="$(BINDIR)", LUADIR="$(LUADIR)", diff --git a/Makefile b/Makefile index b3111f9..52501c3 100644 --- a/Makefile +++ b/Makefile @@ -100,12 +100,16 @@ ifdef LUADIR endif ifdef BINDIR @mkdir -p "$(BINDIR)"; +ifneq ($(WRAP),false) ifeq ($(filter /%,$(LUA)),) @echo '$(FIX_SHEBANG)' | $(LUA) - "/usr/bin/env $(LUA)" "$(abspath $(LIBDIR))" > "$(BINDIR)/tomlua" else @echo '$(FIX_SHEBANG)' | $(LUA) - "$(LUA)" "$(abspath $(LIBDIR))" > "$(BINDIR)/tomlua" endif @cat "$(SRC)/bin/tomlua" >> "$(BINDIR)/tomlua"; +else + @cat "$(SRC)/bin/tomlua" > "$(BINDIR)/tomlua"; +endif @chmod +x "$(BINDIR)/tomlua"; @echo "Installed binary to $(BINDIR)"; endif diff --git a/tomlua-scm-1.rockspec b/tomlua-scm-1.rockspec index c2b2e17..1e36a12 100644 --- a/tomlua-scm-1.rockspec +++ b/tomlua-scm-1.rockspec @@ -21,8 +21,10 @@ build = { type = "make", build_variables = { LUA_INCDIR="$(LUA_INCDIR)", + LIBFLAG="$(LIBFLAG)", }, install_variables = { + WRAP = "false", LIBDIR="$(LIBDIR)", BINDIR="$(BINDIR)", LUADIR="$(LUADIR)", @@ -33,16 +35,3 @@ test = { type = "command", command = "make test", } - --- How do I specify CFLAGS -O3 and maybe -flto here? --- build = { --- type = "builtin", --- modules = { --- tomlua = { --- "./src/tomlua.c", --- "./src/decode.c", --- "./src/encode.c", --- "./src/dates.c", --- }, --- } --- }