From 815cf73c266e371fe2eaa81787572564736e2b02 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 4 Oct 2017 13:47:17 -0300 Subject: Make Makefiles install site_config.lua in new location. Fixes #735. --- Makefile.luarocks | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.luarocks') diff --git a/Makefile.luarocks b/Makefile.luarocks index 20ede467..f0652891 100644 --- a/Makefile.luarocks +++ b/Makefile.luarocks @@ -12,4 +12,5 @@ install: install_bins install_luas copy_site_config copy_site_config: luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \ mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"; \ - lprefix=`echo "$(LUADIR)" | sed 's,/lib/luarocks/.*,,'`; sed "s,LUAROCKS_PREFIX=.*,LUAROCKS_PREFIX=[[$$lprefix]],g" $(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/site_config.lua > "$(DESTDIR)$(LUADIR)/luarocks/site_config.lua" + site_config="site_config_$(echo "$luaver" | sed 's,\.,_,').lua" + lprefix=$(echo "$(LUADIR)" | sed 's,/lib/luarocks/.*,,'); sed "s,LUAROCKS_PREFIX=.*,LUAROCKS_PREFIX=[[$$lprefix]],g" "$(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/core/$$site_config" > "$(DESTDIR)$(LUADIR)/luarocks/core/$$site_config" -- cgit v1.2.3-55-g6feb