Skip to content

Commit

Permalink
fix(tooling): Allow make dist on systems without native lua packages
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Jul 9, 2020
1 parent 3ef69bb commit 5758085
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ LUAMODLOCK := sile-dev-1.rockslock
LUAMODSPEC := sile-dev-1.rockspec
genrockslock := $(LUAROCKS) $(LUAROCKSARGS) list --porcelain | awk '{print $$1 " " $$2}'
rocksmatch := cmp -s $(LUAMODLOCK) <($(genrockslock))
else
LUAROCKS := luarocks --tree lua_modules_dist --lua-version $(LUA_VERSION)
endif

BUILT_SOURCES = .version
Expand Down Expand Up @@ -102,7 +104,7 @@ endif
.PHONY: lua_modules_dist
lua_modules_dist: $(LUAMODSPEC) force
$(foreach LUA,$(SUPPORTED_LUAS),
$(LUAROCKS) --tree lua_modules_dist --lua-version $(LUA) install --only-deps $<)
$(LUAROCKS) $(LUAROCKSARGS) --lua-version $(LUA) install --only-deps $<)

DEPDIR := .deps
REGRESSIONSCRIPT := ./tests/regressions.pl
Expand Down

0 comments on commit 5758085

Please sign in to comment.