diff options
author | Philipp Janda <siffiejoe@gmx.net> | 2014-05-27 02:45:06 +0200 |
---|---|---|
committer | Philipp Janda <siffiejoe@gmx.net> | 2014-05-27 02:45:06 +0200 |
commit | dbb63f8248eca42da4fad45c718fe7d70ec8eacc (patch) | |
tree | 80ac9c7bcb19a237c667b5f1b7ec6adfaa5a0ae7 /Makefile | |
parent | 64eea52bca48ba979ec8f485859f449983c056c5 (diff) | |
parent | dc9d2daf9deaf867b6caaf88ab1bb088e2b4622d (diff) | |
download | luarocks-dbb63f8248eca42da4fad45c718fe7d70ec8eacc.tar.gz luarocks-dbb63f8248eca42da4fad45c718fe7d70ec8eacc.tar.bz2 luarocks-dbb63f8248eca42da4fad45c718fe7d70ec8eacc.zip |
Merge remote-tracking branch 'upstream/master' into staticlibs
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -24,7 +24,8 @@ 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_cmd.lua write_rockspec.lua doc.lua | 27 | purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua upload.lua \ |
28 | upload/api.lua upload/multipart.lua fetch/git_http.lua | ||
28 | 29 | ||
29 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua | 30 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua |
30 | 31 | ||