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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -24,7 +24,7 @@ remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \ | |||
| 24 | manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \ | 24 | manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \ |
| 25 | help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \ | 25 | help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \ |
| 26 | admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \ | 26 | admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \ |
| 27 | purge.lua path.lua path_command.lua write_rockspec.lua doc.lua | 27 | purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua |
| 28 | 28 | ||
| 29 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua | 29 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua |
| 30 | 30 | ||