diff options
| author | daurnimator <quae@daurnimator.com> | 2018-08-05 14:57:27 +1000 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-10 22:49:47 -0300 |
| commit | 518171956de5453edf2c45c8df6591b523e82673 (patch) | |
| tree | d5d7ff85fe45983265771e5caab711eb309c65d2 | |
| parent | fdc3bcf015d53fca33cefed57a05c7dd38226aea (diff) | |
| download | luarocks-518171956de5453edf2c45c8df6591b523e82673.tar.gz luarocks-518171956de5453edf2c45c8df6591b523e82673.tar.bz2 luarocks-518171956de5453edf2c45c8df6591b523e82673.zip | |
GNUmakefile: Use LUA variable to find lua to run
| -rw-r--r-- | GNUmakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 5b9b6475..ba975b99 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
| @@ -57,7 +57,7 @@ luarocks: config.unix config-$(LUA_VERSION).lua.in | |||
| 57 | rm -f src/luarocks/core/hardcoded.lua | 57 | rm -f src/luarocks/core/hardcoded.lua |
| 58 | echo "#!/bin/sh" > luarocks | 58 | echo "#!/bin/sh" > luarocks |
| 59 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks | 59 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks |
| 60 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks | 60 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks |
| 61 | chmod +rx ./luarocks | 61 | chmod +rx ./luarocks |
| 62 | ./luarocks init | 62 | ./luarocks init |
| 63 | cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua | 63 | cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua |
| @@ -66,7 +66,7 @@ luarocks-admin: config.unix | |||
| 66 | rm -f src/luarocks/core/hardcoded.lua | 66 | rm -f src/luarocks/core/hardcoded.lua |
| 67 | echo "#!/bin/sh" > luarocks-admin | 67 | echo "#!/bin/sh" > luarocks-admin |
| 68 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin | 68 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin |
| 69 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin | 69 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin |
| 70 | chmod +rx ./luarocks-admin | 70 | chmod +rx ./luarocks-admin |
| 71 | 71 | ||
| 72 | ./build/luarocks: src/bin/luarocks config.unix | 72 | ./build/luarocks: src/bin/luarocks config.unix |