3 files changed, 7 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 63c33636..b44ab1ca 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@ all:
            cat src/bin/$$f.bak >> src/bin/$$f ;\
            rm src/bin/$$f.bak ;\
         done
+        sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua
+        rm src/luarocks/cfg.lua.bak
         cp src/luarocks/cfg.lua src/luarocks/cfg.lua.bak
         rm src/luarocks/cfg.lua
         if [ -n "$(PREFIX)" ] ;\
diff --git a/configure b/configure
index 5f4902de..954fa93d 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@
 
 PREFIX="/usr/local"
 SYSCONFDIR="$PREFIX/etc/luarocks"
-ROCKS_TREE="$PREFIX/lib/luarocks"
+ROCKS_TREE="$PREFIX"
 SCRIPTS_DIR=""
 LUA_MODULES_DIR=""
 BIN_MODULES_DIR=""
@@ -33,7 +33,7 @@ Configure LuaRocks.
 --sysconfdir=DIR            Location where the config file should be installed.
                             Default is \$PREFIX/etc/luarocks
 --rocks-tree=FILE           Root of the local tree of installed rocks.
-                            Default is \$PREFIX/lib/luarocks
+                            Default is \$PREFIX
 
 Where to install files installed by rocks, to make the accessible to Lua and
 your \$PATH. Beware of clashes between files installed by LuaRocks and by your
diff --git a/makedist b/makedist
index 3e78040a..ebaae76e 100755
--- a/makedist
+++ b/makedist
@@ -4,7 +4,7 @@ cvslist() {
    if [ "$1" ]
    then local prefix="$1/"
    fi   
-   cvs list $1 | grep -v "^?" | while read line
+   svn list $1 | grep -v "^?" | while read line
    do
       local path="$prefix$line"
       echo "$path"
@@ -21,10 +21,10 @@ then
    exit 1
 fi
 
-cvs list > /dev/null 2> /dev/null
+svn list > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
-   echo "Your version of CVS may be too old. At least 1.12 is needed."
+   echo "Your version of svn may be too old."
    exit 1
 fi