set defaults for lua_modules_dir and bin_modules_dir

git-svn-id: http://luarocks.org/svn/luarocks/trunk@39 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
author: hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> 2009-07-08 20:55:55 +0000
committer: hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> 2009-07-08 20:55:55 +0000
commit: 565a4515e628dfb540539b18a2998aa915917409 (patch)
tree: ebbf1da7c734f02f5b19ddbc1182dc1f38f57160 /configure
parent: f072d458fa89d1af16284353a9a74d2172abc83c (diff)
download: luarocks-565a4515e628dfb540539b18a2998aa915917409.tar.gz
luarocks-565a4515e628dfb540539b18a2998aa915917409.tar.bz2
luarocks-565a4515e628dfb540539b18a2998aa915917409.zip
1 files changed, 26 insertions, 8 deletions
diff --git a/configure b/configure
index 268b7241..5f4902de 100755
--- a/configure
+++ b/configure
@@ -9,6 +9,8 @@ PREFIX="/usr/local"
 SYSCONFDIR="$PREFIX/etc/luarocks"
 ROCKS_TREE="$PREFIX/lib/luarocks"
 SCRIPTS_DIR=""
+LUA_MODULES_DIR=""
+BIN_MODULES_DIR=""
 LUA_SUFFIX=""
 LUA_DIR="/usr"
 LUA_BINDIR="/usr/bin"
@@ -32,14 +34,18 @@ Configure LuaRocks.
                            Default is \$PREFIX/etc/luarocks
 --rocks-tree=FILE           Root of the local tree of installed rocks.
                            Default is \$PREFIX/lib/luarocks
--scripts-dir=DIR           Where to install scripts installed by rocks.
-                            Default is \$ROCKS_TREE/bin. Use this if you
+Where to install files installed by rocks, to make the accessible to Lua and
-                            want to modify it so that rocks install scripts
+your \$PATH. Beware of clashes between files installed by LuaRocks and by your
-                            somewhere else (possibly somewhere in your \$PATH),
+system's package manager.
-                            but if you use a system path such as /usr/bin,
-                            beware of clashes between files installed by
+--scripts-dir=DIR           Where to install scripts installed by added rocks.
-                            LuaRocks and by your system's package manager.
+                            Default is \$LUA_DIR/bin.
-                            Example: /usr/local/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.
 --lua-suffix=SUFFIX         Versioning suffix to use in Lua filenames.
                            Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
 --with-lua=PREFIX           Use Lua from given prefix.
@@ -162,6 +168,16 @@ do
      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
      ;;
@@ -338,6 +354,8 @@ 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
author	hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>	2009-07-08 20:55:55 +0000
committer	hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>	2009-07-08 20:55:55 +0000
commit	565a4515e628dfb540539b18a2998aa915917409 (patch)
tree	ebbf1da7c734f02f5b19ddbc1182dc1f38f57160 /configure
parent	f072d458fa89d1af16284353a9a74d2172abc83c (diff)
download	luarocks-565a4515e628dfb540539b18a2998aa915917409.tar.gz luarocks-565a4515e628dfb540539b18a2998aa915917409.tar.bz2 luarocks-565a4515e628dfb540539b18a2998aa915917409.zip

diff --git a/configure b/configure index 268b7241..5f4902de 100755 --- a/configure +++ b/configure
@@ -9,6 +9,8 @@ PREFIX="/usr/local"
9	SYSCONFDIR="$PREFIX/etc/luarocks"	9	SYSCONFDIR="$PREFIX/etc/luarocks"
10	ROCKS_TREE="$PREFIX/lib/luarocks"	10	ROCKS_TREE="$PREFIX/lib/luarocks"
11	SCRIPTS_DIR=""	11	SCRIPTS_DIR=""
		12	LUA_MODULES_DIR=""
		13	BIN_MODULES_DIR=""
12	LUA_SUFFIX=""	14	LUA_SUFFIX=""
13	LUA_DIR="/usr"	15	LUA_DIR="/usr"
14	LUA_BINDIR="/usr/bin"	16	LUA_BINDIR="/usr/bin"
@@ -32,14 +34,18 @@ Configure LuaRocks.
32	Default is \$PREFIX/etc/luarocks	34	Default is \$PREFIX/etc/luarocks
33	--rocks-tree=FILE Root of the local tree of installed rocks.	35	--rocks-tree=FILE Root of the local tree of installed rocks.
34	Default is \$PREFIX/lib/luarocks	36	Default is \$PREFIX/lib/luarocks
35	--scripts-dir=DIR Where to install scripts installed by rocks.	37
36	Default is \$ROCKS_TREE/bin. Use this if you	38	Where to install files installed by rocks, to make the accessible to Lua and
37	want to modify it so that rocks install scripts	39	your \$PATH. Beware of clashes between files installed by LuaRocks and by your
38	somewhere else (possibly somewhere in your \$PATH),	40	system's package manager.
39	but if you use a system path such as /usr/bin,	41
40	beware of clashes between files installed by	42	--scripts-dir=DIR Where to install scripts installed by added rocks.
41	LuaRocks and by your system's package manager.	43	Default is \$LUA_DIR/bin.
42	Example: /usr/local/bin	44	--lua-modules-dir=DIR Where to install Lua modules installed by rocks.
		45	Default is \$LUA_DIR/share/lua/5.1.
		46	--bin-modules-dir=DIR Where to install binary Lua modules.
		47	Default is \$LUA_DIR/lua/lua/5.1.
		48
43	--lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.	49	--lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
44	Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)	50	Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
45	--with-lua=PREFIX Use Lua from given prefix.	51	--with-lua=PREFIX Use Lua from given prefix.
@@ -162,6 +168,16 @@ do
162	SCRIPTS_DIR="$value"	168	SCRIPTS_DIR="$value"
163	SCRIPTS_DIR_SET=yes	169	SCRIPTS_DIR_SET=yes
164	;;	170	;;
		171	--lua-modules-dir)
		172	[ -n "$value" ] \|\| die "Missing value in flag $key."
		173	LUA_MODULES_DIR="$value"
		174	LUA_MODULES_DIR_SET=yes
		175	;;
		176	--bin-modules-dir)
		177	[ -n "$value" ] \|\| die "Missing value in flag $key."
		178	BIN_MODULES_DIR="$value"
		179	BIN_MODULES_DIR_SET=yes
		180	;;
165	--force-config)	181	--force-config)
166	FORCE_CONFIG=yes	182	FORCE_CONFIG=yes
167	;;	183	;;
@@ -338,6 +354,8 @@ PREFIX=$PREFIX
338	SYSCONFDIR=$SYSCONFDIR	354	SYSCONFDIR=$SYSCONFDIR
339	ROCKS_TREE=$ROCKS_TREE	355	ROCKS_TREE=$ROCKS_TREE
340	SCRIPTS_DIR=$SCRIPTS_DIR	356	SCRIPTS_DIR=$SCRIPTS_DIR
		357	LUA_MODULES_DIR=$LUA_MODULES_DIR
		358	BIN_MODULES_DIR=$BIN_MODULES_DIR
341	LUA_SUFFIX=$LUA_SUFFIX	359	LUA_SUFFIX=$LUA_SUFFIX
342	LUA_DIR=$LUA_DIR	360	LUA_DIR=$LUA_DIR
343	LUA_INCDIR=$LUA_INCDIR	361	LUA_INCDIR=$LUA_INCDIR