aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Janda <siffiejoe@gmx.net>2014-05-27 02:45:06 +0200
committerPhilipp Janda <siffiejoe@gmx.net>2014-05-27 02:45:06 +0200
commitdbb63f8248eca42da4fad45c718fe7d70ec8eacc (patch)
tree80ac9c7bcb19a237c667b5f1b7ec6adfaa5a0ae7 /Makefile
parent64eea52bca48ba979ec8f485859f449983c056c5 (diff)
parentdc9d2daf9deaf867b6caaf88ab1bb088e2b4622d (diff)
downloadluarocks-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--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 46943312..1f9d0e2d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \
24manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \ 24manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
25help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \ 25help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \
26admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \ 26admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua \
27purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua 27purge.lua path.lua path_cmd.lua write_rockspec.lua doc.lua upload.lua \
28upload/api.lua upload/multipart.lua fetch/git_http.lua
28 29
29CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua 30CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua
30 31