aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2012-09-25 17:38:13 -0300
committerHisham Muhammad <hisham@gobolinux.org>2012-09-25 17:38:13 -0300
commite5b5ce7cf3a9e0bb0731692f1839a4647d61ada6 (patch)
tree5197fbe00cfe622ea30c3108532805f8adf04493 /Makefile
parent74b0087d28c735dc5440c4587be3085abbd05257 (diff)
parent30b3abcce493c1e212ae533f486c0bdd558f5c2a (diff)
downloadluarocks-e5b5ce7cf3a9e0bb0731692f1839a4647d61ada6.tar.gz
luarocks-e5b5ce7cf3a9e0bb0731692f1839a4647d61ada6.tar.bz2
luarocks-e5b5ce7cf3a9e0bb0731692f1839a4647d61ada6.zip
Merge branch 'master' into multitree
Add Makefile fixes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fa7f2d73..4c18cd34 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua tools/patch.lua \
19fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua path.lua \ 19fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua path.lua \
20remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \ 20remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \
21manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \ 21manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
22help.lua util.lua index.lua cache.lua add.lua refresh_cache.lua loader.lua \ 22help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \
23admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua 23admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua purge.lua
24 24
25CONFIG_FILE = $(SYSCONFDIR)/config.lua 25CONFIG_FILE = $(SYSCONFDIR)/config.lua
26 26