From d3ab714991d1c9accb37942f2b04a296b679cccd Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 2 Jul 2013 23:22:53 -0300 Subject: Preparing for LuaRocks 2.1.0... let's try to install as a rock this time! --- Makefile | 9 ++++++++- configure | 6 +++++- rockspec | 2 +- src/luarocks/cfg.lua | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a102b2be..491437e8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,14 @@ admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua purge. CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua -all: built +all: + @echo "- Type 'make build' and 'make install':" + @echo " to install to $(PREFIX) as usual." + @echo "- Type 'make bootstrap':" + @echo " to install LuaRocks in $(PREFIX) as a rock." + @echo + +build: src/luarocks/site_config.lua: config.unix rm -f src/luarocks/site_config.lua diff --git a/configure b/configure index 4f4a7c3e..a5aa1f4d 100755 --- a/configure +++ b/configure @@ -436,5 +436,9 @@ echo "Using Lua from: $LUA_DIR" make clean > /dev/null 2> /dev/null echo -echo "Done. You can now run 'make' to build." +echo "Done configuring." +echo "- Type 'make build' and 'make install':" +echo " to install to $PREFIX as usual." +echo "- Type 'make bootstrap':" +echo " to install LuaRocks in $PREFIX as a rock." echo diff --git a/rockspec b/rockspec index 1fa7fa8d..76925bba 100644 --- a/rockspec +++ b/rockspec @@ -1,5 +1,5 @@ package = "LuaRocks" -local VER = "2.0.13" +local VER = "2.1.0" local REV = "1" version = VER.."-"..REV diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 22207531..5d918b13 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -30,7 +30,7 @@ end _M.site_config = site_config -program_version = "2.0.13" +program_version = "2.1.0" local persist = require("luarocks.persist") -- cgit v1.2.3-55-g6feb