Should fix installation of parallel LuaRocks versions when using 'make bootstrap' on both.

Thanks to Philipp Janda for the test case!

1 files changed, 6 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index be83c012..1213a589 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,11 @@ write_sysconfig: built
 install: install_bins install_luas install_site_config write_sysconfig
 
 bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig
-        LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec --tree="$(PREFIX)"
+        if [ -n "$$LUA_PATH_5_2" ] ;\
+        then \
+           LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" LUA_PATH_5_2="$$PWD/src/?.lua;$$LUA_PATH_5_2" src/bin/luarocks make rockspec --tree="$(PREFIX)" ;\
+        else \
+           LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec --tree="$(PREFIX)" ;\
+        fi
 
 install_rock: install_bins install_luas