From 949f9cf25cd984499f756251e59fe22be7aeaa37 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Sun, 5 Aug 2018 14:16:03 +1000
Subject: rocks_tree lowercase to follow convention

---
 Makefile  |  2 +-
 configure | 16 ++++++++--------
 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
 # ----------------------------------------
 
 bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
-	./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)"
+	./luarocks make --tree="$(DESTDIR)$(rocks_tree)"
 
 # ----------------------------------------
 # Windows binary build
diff --git a/configure b/configure
index 6b8f5391..a145e62c 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
 prefix="/usr/local"
 sysconfdir="$prefix/etc"
 luarocksconfdir="$sysconfdir/luarocks"
-ROCKS_TREE="$prefix"
+rocks_tree="$prefix"
 
 # ----------------------------------------------------------------------------
 # FUNCTION DEFINITIONS
@@ -252,8 +252,8 @@ do
    # -----------------------------------------
    --rocks-tree)
       [ -n "$value" ] || die "Missing value in flag $key."
-      ROCKS_TREE="$(canonicalpath "$value")"
-      ROCKS_TREE_SET=yes
+      rocks_tree="$(canonicalpath "$value")"
+      rocks_tree_SET=yes
       ;;
 
    # Where is your Lua interpreter:
@@ -347,9 +347,9 @@ then
    luarocksconfdir=$sysconfdir/luarocks
 fi
 
-if [ "$prefix_SET" = "yes" ] && [ ! "$ROCKS_TREE_SET" = "yes" ]
+if [ "$prefix_SET" = "yes" ] && [ ! "$rocks_tree_SET" = "yes" ]
 then
-   ROCKS_TREE=$prefix
+   rocks_tree=$prefix
 fi
 
 # ----------------------------------------
@@ -489,7 +489,7 @@ cat <<EOF > config.unix
 
 prefix=$prefix
 luarocksconfdir=$luarocksconfdir
-ROCKS_TREE=$ROCKS_TREE
+rocks_tree=$rocks_tree
 LUA_VERSION=$LUA_VERSION
 LUA_INTERPRETER=$LUA_INTERPRETER
 LUA_DIR=$LUA_DIR
@@ -520,7 +520,7 @@ BLUE "Done configuring."
 echo
 echo
 echo "LuaRocks will be installed at......: $(GREEN "$prefix")"
-echo "LuaRocks will install rocks at.....: $(GREEN "$ROCKS_TREE")"
+echo "LuaRocks will install rocks at.....: $(GREEN "$rocks_tree")"
 echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")"
 echo "Using Lua from.....................: $(GREEN "$LUA_DIR")"
 if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi
@@ -530,5 +530,5 @@ echo
 echo "* Type $(BOLD make) and $(BOLD make install):"
 echo "  to install to $prefix as usual."
 echo "* Type $(BOLD make bootstrap):"
-echo "  to install LuaRocks into $ROCKS_TREE as a rock."
+echo "  to install LuaRocks into $rocks_tree as a rock."
 echo
-- 
cgit v1.2.3-55-g6feb