diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2024-02-17 15:46:01 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2024-02-18 20:49:05 -0300 |
| commit | d83b908a7371360d117cabbf6da099170f5fb178 (patch) | |
| tree | f795b4f1e362da5d8204a6433ff7927888ada222 /GNUmakefile | |
| parent | 4eee542ddcbde8df3bd64eee0bda87d6b96e0005 (diff) | |
| download | luarocks-d83b908a7371360d117cabbf6da099170f5fb178.tar.gz luarocks-d83b908a7371360d117cabbf6da099170f5fb178.tar.bz2 luarocks-d83b908a7371360d117cabbf6da099170f5fb178.zip | |
drop cfg.lua_interpreter, use cfg.variables.LUA
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index cbb47996..22a1d817 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
| @@ -7,8 +7,7 @@ INSTALL = install | |||
| 7 | INSTALL_DATA = $(INSTALL) -m 644 | 7 | INSTALL_DATA = $(INSTALL) -m 644 |
| 8 | BINARY_PLATFORM = unix | 8 | BINARY_PLATFORM = unix |
| 9 | 9 | ||
| 10 | SHEBANG = \#!$(LUA_BINDIR)/$(LUA_INTERPRETER) | 10 | SHEBANG = \#!$(LUA) |
| 11 | LUA = $(LUA_BINDIR)/$(LUA_INTERPRETER) | ||
| 12 | luarocksconfdir = $(sysconfdir)/luarocks | 11 | luarocksconfdir = $(sysconfdir)/luarocks |
| 13 | luadir = $(datarootdir)/lua/$(LUA_VERSION) | 12 | luadir = $(datarootdir)/lua/$(LUA_VERSION) |
| 14 | builddir = ./build | 13 | builddir = ./build |
| @@ -38,12 +37,13 @@ $(builddir)/config-$(LUA_VERSION).lua: config.unix | |||
| 38 | ' { name = "user", root = home .. "/.luarocks" };\n'\ | 37 | ' { name = "user", root = home .. "/.luarocks" };\n'\ |
| 39 | "$$([ "$(rocks_tree)" != "$(HOME)/.luarocks" ] && printf ' { name = "system", root = "'"$(rocks_tree)"'" };\\n')"\ | 38 | "$$([ "$(rocks_tree)" != "$(HOME)/.luarocks" ] && printf ' { name = "system", root = "'"$(rocks_tree)"'" };\\n')"\ |
| 40 | '}\n'\ | 39 | '}\n'\ |
| 41 | "$$([ -n "$(LUA_INTERPRETER)" ] && printf 'lua_interpreter = "%s";\\n' "$(LUA_INTERPRETER)")"\ | ||
| 42 | 'variables = {\n'\ | 40 | 'variables = {\n'\ |
| 43 | "$$([ -n "$(LUA_DIR)" ] && printf ' LUA_DIR = "%s";\\n' "$(LUA_DIR)")"\ | 41 | "$$([ -n "$(LUA_DIR)" ] && printf ' LUA_DIR = "%s";\\n' "$(LUA_DIR)")"\ |
| 44 | "$$([ -n "$(LUA_INCDIR)" ] && printf ' LUA_INCDIR = "%s";\\n' "$(LUA_INCDIR)")"\ | 42 | "$$([ -n "$(LUA_INCDIR)" ] && printf ' LUA_INCDIR = "%s";\\n' "$(LUA_INCDIR)")"\ |
| 45 | "$$([ -n "$(LUA_BINDIR)" ] && printf ' LUA_BINDIR = "%s";\\n' "$(LUA_BINDIR)")"\ | 43 | "$$([ -n "$(LUA_BINDIR)" ] && printf ' LUA_BINDIR = "%s";\\n' "$(LUA_BINDIR)")"\ |
| 46 | "$$([ -n "$(LUA_LIBDIR)" ] && printf ' LUA_LIBDIR = "%s";\\n' "$(LUA_LIBDIR)")"\ | 44 | "$$([ -n "$(LUA_LIBDIR)" ] && printf ' LUA_LIBDIR = "%s";\\n' "$(LUA_LIBDIR)")"\ |
| 45 | "$$([ -n "$(LUA_VERSION)" ] && printf ' LUA_VERSION = "%s";\\n' "$(LUA_VERSION)")"\ | ||
| 46 | "$$([ -n "$(LUA)" ] && printf ' LUA = "%s";\\n' "$(LUA)")"\ | ||
| 47 | '}\n'\ | 47 | '}\n'\ |
| 48 | > $@ | 48 | > $@ |
| 49 | 49 | ||