Append LUA_PATH/LUA_CPATH to the _MAKE versions in the Makefile

Author: Shados

Makefile

@@ -1,8 +1,8 @@
 LUA ?= lua5.1
 LUA_VERSION = $(shell $(LUA) -e 'print(_VERSION:match("%d%.%d"))')
 LUAROCKS = luarocks-$(LUA_VERSION)
-LUA_PATH_MAKE = $(shell $(LUAROCKS) path --lr-path);./?.lua;./?/init.lua
-LUA_CPATH_MAKE = $(shell $(LUAROCKS) path --lr-cpath);./?.so
+LUA_PATH_MAKE = $(shell $(LUAROCKS) path --lr-path);./?.lua;./?/init.lua;$(LUA_PATH)
+LUA_CPATH_MAKE = $(shell $(LUAROCKS) path --lr-cpath);./?.so;$(LUA_CPATH)
 
 .PHONY: test local compile compile_system watch lint count show
 

bin/moonc

@@ -163,7 +163,7 @@ if opts.watch then
 	end
 
 	for fname in protected do
-		local target = path_to_target(fname, opts.t)
+		local target = path_to_target(fname, opts.output_to)
 
 		if opts.o then
 			target = opts.o