diff options
| author | mpeterv <petjamelnik@yandex.ru> | 2014-03-21 11:56:31 +0400 |
|---|---|---|
| committer | mpeterv <petjamelnik@yandex.ru> | 2014-03-21 11:56:31 +0400 |
| commit | 8498916df098bfcf17947537427cc1fffdeea2a5 (patch) | |
| tree | 841974f23a6300ce138f20faef31ea67ed41d98b /configure | |
| parent | d9c799153ebf5645cf7d7a8fe473c5aff32ec4d3 (diff) | |
| parent | 397659cc5cb30569b33cc9c0ab220f85379bc97f (diff) | |
| download | luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.tar.gz luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.tar.bz2 luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks into lua52_compat
Conflicts:
src/bin/luarocks
src/luarocks/fs/unix/tools.lua
src/luarocks/path.lua
Fixed:
src/luarocks/path_cmd.lua: moved meta-data from path.lua
Makefile: added path_cmd.lua to the list of installed files
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -36,7 +36,7 @@ Where to install files installed by rocks, to make the accessible to Lua and | |||
| 36 | your \$PATH. Beware of clashes between files installed by LuaRocks and by your | 36 | your \$PATH. Beware of clashes between files installed by LuaRocks and by your |
| 37 | system's package manager. | 37 | system's package manager. |
| 38 | 38 | ||
| 39 | --rocks-tree=FILE Root of the local tree of installed rocks. | 39 | --rocks-tree=DIR Root of the local tree of installed rocks. |
| 40 | Default is \$PREFIX | 40 | Default is \$PREFIX |
| 41 | 41 | ||
| 42 | --lua-version=VERSION Use specific Lua version: 5.1 or 5.2 | 42 | --lua-version=VERSION Use specific Lua version: 5.1 or 5.2 |