diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | prefix="/usr/local" | 5 | prefix="/usr/local" |
6 | sysconfdir="$prefix/etc" | 6 | sysconfdir="$prefix/etc" |
7 | luarocksconfdir="$sysconfdir/luarocks" | ||
8 | rocks_tree="$prefix" | 7 | rocks_tree="$prefix" |
9 | 8 | ||
10 | # ---------------------------------------------------------------------------- | 9 | # ---------------------------------------------------------------------------- |
@@ -108,7 +107,6 @@ For better control, use the options below. | |||
108 | 107 | ||
109 | Fine tuning of the installation directories: | 108 | Fine tuning of the installation directories: |
110 | --sysconfdir=SYSCONFDIR Directory for single-machine config [PREFIX/etc] | 109 | --sysconfdir=SYSCONFDIR Directory for single-machine config [PREFIX/etc] |
111 | --luarocksconfdir=DIR Directory for luarocks config [SYSCONFDIR/luarocks] | ||
112 | 110 | ||
113 | Where to install files provided by rocks: | 111 | Where to install files provided by rocks: |
114 | --rocks-tree=DIR Root of the local tree of installed rocks. | 112 | --rocks-tree=DIR Root of the local tree of installed rocks. |
@@ -241,11 +239,6 @@ do | |||
241 | sysconfdir="$(canonicalpath "$value")" | 239 | sysconfdir="$(canonicalpath "$value")" |
242 | sysconfdir_SET=yes | 240 | sysconfdir_SET=yes |
243 | ;; | 241 | ;; |
244 | --luarocksconfdir) | ||
245 | [ -n "$value" ] || die "Missing value in flag $key." | ||
246 | luarocksconfdir="$(canonicalpath "$value")" | ||
247 | luarocksconfdir_SET=yes | ||
248 | ;; | ||
249 | 242 | ||
250 | 243 | ||
251 | # Where to install files provided by rocks: | 244 | # Where to install files provided by rocks: |
@@ -342,11 +335,6 @@ then | |||
342 | sysconfdir_SET=yes | 335 | sysconfdir_SET=yes |
343 | fi | 336 | fi |
344 | 337 | ||
345 | if [ "$sysconfdir_SET" = "yes" ] && [ ! "$luarocksconfdir_SET" = "yes" ] | ||
346 | then | ||
347 | luarocksconfdir=$sysconfdir/luarocks | ||
348 | fi | ||
349 | |||
350 | if [ "$prefix_SET" = "yes" ] && [ ! "$rocks_tree_SET" = "yes" ] | 338 | if [ "$prefix_SET" = "yes" ] && [ ! "$rocks_tree_SET" = "yes" ] |
351 | then | 339 | then |
352 | rocks_tree=$prefix | 340 | rocks_tree=$prefix |
@@ -488,7 +476,7 @@ cat <<EOF > config.unix | |||
488 | # Run "./configure --help" for details. | 476 | # Run "./configure --help" for details. |
489 | 477 | ||
490 | prefix=$prefix | 478 | prefix=$prefix |
491 | luarocksconfdir=$luarocksconfdir | 479 | sysconfdir=$sysconfdir |
492 | rocks_tree=$rocks_tree | 480 | rocks_tree=$rocks_tree |
493 | LUA_VERSION=$LUA_VERSION | 481 | LUA_VERSION=$LUA_VERSION |
494 | LUA_INTERPRETER=$LUA_INTERPRETER | 482 | LUA_INTERPRETER=$LUA_INTERPRETER |
@@ -505,7 +493,7 @@ echo | |||
505 | echo | 493 | echo |
506 | echo "LuaRocks will be installed at......: $(GREEN "$prefix")" | 494 | echo "LuaRocks will be installed at......: $(GREEN "$prefix")" |
507 | echo "LuaRocks will install rocks at.....: $(GREEN "$rocks_tree")" | 495 | echo "LuaRocks will install rocks at.....: $(GREEN "$rocks_tree")" |
508 | echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")" | 496 | echo "LuaRocks configuration directory...: $(GREEN "$sysconfdir/luarocks")" |
509 | echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" | 497 | echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" |
510 | if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi | 498 | if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi |
511 | if [ "$LUA_INCDIR_SET" = "yes" ]; then echo "Lua include directory..............: $(GREEN "$LUA_INCDIR")" ; fi | 499 | if [ "$LUA_INCDIR_SET" = "yes" ]; then echo "Lua include directory..............: $(GREEN "$LUA_INCDIR")" ; fi |