diff options
author | Hisham <hisham@gobolinux.org> | 2016-10-06 15:41:47 -0300 |
---|---|---|
committer | Hisham <hisham@gobolinux.org> | 2016-10-06 15:41:47 -0300 |
commit | 23ebbf0d8548caa0958ad3aa9e08ca9a726682ea (patch) | |
tree | 76e2c7da9b0c2c6225d4ac4ef8a409837cd50fda | |
parent | c0b0b88a3da1fa78d2ac1e059b2b64684eb2a8b2 (diff) | |
parent | 1fea0e3a0972bcc6b4319cd3d9e79834562486bc (diff) | |
download | luarocks-2.4.1.tar.gz luarocks-2.4.1.tar.bz2 luarocks-2.4.1.zip |
Merge branch 'master' into 2.4.1v2.4.1
-rw-r--r-- | Makefile.luarocks | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.luarocks b/Makefile.luarocks index 1eecfeae..20ede467 100644 --- a/Makefile.luarocks +++ b/Makefile.luarocks | |||
@@ -12,4 +12,4 @@ install: install_bins install_luas copy_site_config | |||
12 | copy_site_config: | 12 | copy_site_config: |
13 | luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \ | 13 | luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \ |
14 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"; \ | 14 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"; \ |
15 | cp $(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks" | 15 | 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" |