cleanup configure

git-svn-id: http://luarocks.org/svn/luarocks/trunk@113 9ca3f7c1-7366-0410-b1a3-b5c78f85698c

2 files changed, 3 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index c10a1cb0..9151fb90 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ include config.unix
 
 DESTDIR =
 PREFIX ?= /usr/local
+ROCKS_TREE ?= $(PREFIX)
 SYSCONFDIR ?= $(PREFIX)/etc/luarocks
 BINDIR ?= $(PREFIX)/bin
 LUADIR ?= $(PREFIX)/share/lua/5.1/
diff --git a/configure b/configure
index 25ea14c8..8fef5213 100755
--- a/configure
+++ b/configure
@@ -8,9 +8,6 @@
 PREFIX="/usr/local"
 SYSCONFDIR="$PREFIX/etc/luarocks"
 ROCKS_TREE="$PREFIX"
-SCRIPTS_DIR=""
-LUA_MODULES_DIR=""
-BIN_MODULES_DIR=""
 LUA_SUFFIX=""
 LUA_DIR="/usr"
 LUA_BINDIR="/usr/bin"
@@ -32,19 +29,13 @@ Configure LuaRocks.
                             Default is $PREFIX
 --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
 
 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
 system's package manager.
 
---scripts-dir=DIR           Where to install scripts installed by added rocks.
-                            Default is \$LUA_DIR/bin.
---lua-modules-dir=DIR       Where to install Lua modules installed by rocks.
-                            Default is \$LUA_DIR/share/lua/5.1.
---bin-modules-dir=DIR       Where to install binary Lua modules.
-                            Default is \$LUA_DIR/lua/lua/5.1.
+--rocks-tree=FILE           Root of the local tree of installed rocks.
+                            Default is \$PREFIX
 
 --lua-suffix=SUFFIX         Versioning suffix to use in Lua filenames.
                             Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
@@ -163,21 +154,6 @@ do
       ROCKS_TREE="$value"
       ROCKS_TREE_SET=yes
       ;;
-   --scripts-dir)
-      [ -n "$value" ] || die "Missing value in flag $key."
-      SCRIPTS_DIR="$value"
-      SCRIPTS_DIR_SET=yes
-      ;;
-   --lua-modules-dir)
-      [ -n "$value" ] || die "Missing value in flag $key."
-      LUA_MODULES_DIR="$value"
-      LUA_MODULES_DIR_SET=yes
-      ;;
-   --bin-modules-dir)
-      [ -n "$value" ] || die "Missing value in flag $key."
-      BIN_MODULES_DIR="$value"
-      BIN_MODULES_DIR_SET=yes
-      ;;
    --force-config)
       FORCE_CONFIG=yes
       ;;
@@ -354,9 +330,6 @@ cat <<EOF > config.unix
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
 ROCKS_TREE=$ROCKS_TREE
-SCRIPTS_DIR=$SCRIPTS_DIR
-LUA_MODULES_DIR=$LUA_MODULES_DIR
-BIN_MODULES_DIR=$BIN_MODULES_DIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
 LUA_INCDIR=$LUA_INCDIR