aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-08-05 14:16:03 +1000
committerHisham Muhammad <hisham@gobolinux.org>2018-08-10 16:52:18 -0300
commit949f9cf25cd984499f756251e59fe22be7aeaa37 (patch)
treee2c09131b17182d2b100a1b267b2d766bc919edb
parent2256ef29c0a64a0e8230e8104cdcae1f1923bebd (diff)
downloadluarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.tar.gz
luarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.tar.bz2
luarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.zip
rocks_tree lowercase to follow convention
-rw-r--r--Makefile2
-rwxr-xr-xconfigure16
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index d1ae9d46..ffc5e6e8 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe
109# ---------------------------------------- 109# ----------------------------------------
110 110
111bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua 111bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
112 ./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)" 112 ./luarocks make --tree="$(DESTDIR)$(rocks_tree)"
113 113
114# ---------------------------------------- 114# ----------------------------------------
115# Windows binary build 115# Windows binary build
diff --git a/configure b/configure
index 6b8f5391..a145e62c 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
5prefix="/usr/local" 5prefix="/usr/local"
6sysconfdir="$prefix/etc" 6sysconfdir="$prefix/etc"
7luarocksconfdir="$sysconfdir/luarocks" 7luarocksconfdir="$sysconfdir/luarocks"
8ROCKS_TREE="$prefix" 8rocks_tree="$prefix"
9 9
10# ---------------------------------------------------------------------------- 10# ----------------------------------------------------------------------------
11# FUNCTION DEFINITIONS 11# FUNCTION DEFINITIONS
@@ -252,8 +252,8 @@ do
252 # ----------------------------------------- 252 # -----------------------------------------
253 --rocks-tree) 253 --rocks-tree)
254 [ -n "$value" ] || die "Missing value in flag $key." 254 [ -n "$value" ] || die "Missing value in flag $key."
255 ROCKS_TREE="$(canonicalpath "$value")" 255 rocks_tree="$(canonicalpath "$value")"
256 ROCKS_TREE_SET=yes 256 rocks_tree_SET=yes
257 ;; 257 ;;
258 258
259 # Where is your Lua interpreter: 259 # Where is your Lua interpreter:
@@ -347,9 +347,9 @@ then
347 luarocksconfdir=$sysconfdir/luarocks 347 luarocksconfdir=$sysconfdir/luarocks
348fi 348fi
349 349
350if [ "$prefix_SET" = "yes" ] && [ ! "$ROCKS_TREE_SET" = "yes" ] 350if [ "$prefix_SET" = "yes" ] && [ ! "$rocks_tree_SET" = "yes" ]
351then 351then
352 ROCKS_TREE=$prefix 352 rocks_tree=$prefix
353fi 353fi
354 354
355# ---------------------------------------- 355# ----------------------------------------
@@ -489,7 +489,7 @@ cat <<EOF > config.unix
489 489
490prefix=$prefix 490prefix=$prefix
491luarocksconfdir=$luarocksconfdir 491luarocksconfdir=$luarocksconfdir
492ROCKS_TREE=$ROCKS_TREE 492rocks_tree=$rocks_tree
493LUA_VERSION=$LUA_VERSION 493LUA_VERSION=$LUA_VERSION
494LUA_INTERPRETER=$LUA_INTERPRETER 494LUA_INTERPRETER=$LUA_INTERPRETER
495LUA_DIR=$LUA_DIR 495LUA_DIR=$LUA_DIR
@@ -520,7 +520,7 @@ BLUE "Done configuring."
520echo 520echo
521echo 521echo
522echo "LuaRocks will be installed at......: $(GREEN "$prefix")" 522echo "LuaRocks will be installed at......: $(GREEN "$prefix")"
523echo "LuaRocks will install rocks at.....: $(GREEN "$ROCKS_TREE")" 523echo "LuaRocks will install rocks at.....: $(GREEN "$rocks_tree")"
524echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")" 524echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")"
525echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" 525echo "Using Lua from.....................: $(GREEN "$LUA_DIR")"
526if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi 526if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi
@@ -530,5 +530,5 @@ echo
530echo "* Type $(BOLD make) and $(BOLD make install):" 530echo "* Type $(BOLD make) and $(BOLD make install):"
531echo " to install to $prefix as usual." 531echo " to install to $prefix as usual."
532echo "* Type $(BOLD make bootstrap):" 532echo "* Type $(BOLD make bootstrap):"
533echo " to install LuaRocks into $ROCKS_TREE as a rock." 533echo " to install LuaRocks into $rocks_tree as a rock."
534echo 534echo