From a79bd18dac67c9700d794f6b31f3e97fd6873375 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 2 Dec 2015 00:02:33 +0300
Subject: install lua symlinks to $(PREFIX)/$(BUILD)/bin

... instead of $(PREFIX)/bin, not to clobber the user's normal
tools.

See #1017
---
 plugins/luarocks/luarocks.mk | 2 +-
 src/lua.mk                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk
index 254e303..3ec4404 100644
--- a/plugins/luarocks/luarocks.mk
+++ b/plugins/luarocks/luarocks.mk
@@ -24,7 +24,7 @@ define $(PKG)_BUILD_SHARED
         --rocks-tree='$(PREFIX)/$(TARGET)' \
         --lua-version='$(lua_SHORTVER)' \
         --with-lua='$(PREFIX)/$(TARGET)' \
-        --with-lua-bin='$(PREFIX)/bin' \
+        --with-lua-bin='$(PREFIX)/$(BUILD)/bin' \
         --with-downloader='wget' \
         --with-md5-checker='openssl'
     $(MAKE) -C '$(1)' build \
diff --git a/src/lua.mk b/src/lua.mk
index edd3333..7dfe326 100644
--- a/src/lua.mk
+++ b/src/lua.mk
@@ -81,7 +81,7 @@ define $(PKG)_BUILD_$(BUILD)
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' \
         PLAT=$(shell ([ `uname -s` == Darwin ] && echo "macosx") || echo `uname -s` | tr '[:upper:]' '[:lower:]')
     $(INSTALL) '$(1)/src/lua' '$(PREFIX)/bin/$(BUILD)-lua'
-    ln -sf '$(BUILD)-lua' '$(PREFIX)/bin/lua'
+    ln -sf '$(PREFIX)/bin/$(BUILD)-lua' '$(PREFIX)/$(BUILD)/bin/lua'
     $(INSTALL) '$(1)/src/luac' '$(PREFIX)/bin/$(BUILD)-luac'
-    ln -sf '$(BUILD)-luac' '$(PREFIX)/bin/luac'
+    ln -sf '$(PREFIX)/bin/$(BUILD)-luac' '$(PREFIX)/$(BUILD)/bin/luac'
 endef
-- 
cgit v0.12