diff options
| author | daurnimator <quae@daurnimator.com> | 2018-08-05 14:16:03 +1000 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-10 16:52:18 -0300 |
| commit | 949f9cf25cd984499f756251e59fe22be7aeaa37 (patch) | |
| tree | e2c09131b17182d2b100a1b267b2d766bc919edb | |
| parent | 2256ef29c0a64a0e8230e8104cdcae1f1923bebd (diff) | |
| download | luarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.tar.gz luarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.tar.bz2 luarocks-949f9cf25cd984499f756251e59fe22be7aeaa37.zip | |
rocks_tree lowercase to follow convention
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 16 |
2 files changed, 9 insertions, 9 deletions
| @@ -109,7 +109,7 @@ install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe | |||
| 109 | # ---------------------------------------- | 109 | # ---------------------------------------- |
| 110 | 110 | ||
| 111 | bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua | 111 | bootstrap: 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 |
| @@ -5,7 +5,7 @@ | |||
| 5 | prefix="/usr/local" | 5 | prefix="/usr/local" |
| 6 | sysconfdir="$prefix/etc" | 6 | sysconfdir="$prefix/etc" |
| 7 | luarocksconfdir="$sysconfdir/luarocks" | 7 | luarocksconfdir="$sysconfdir/luarocks" |
| 8 | ROCKS_TREE="$prefix" | 8 | rocks_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 |
| 348 | fi | 348 | fi |
| 349 | 349 | ||
| 350 | if [ "$prefix_SET" = "yes" ] && [ ! "$ROCKS_TREE_SET" = "yes" ] | 350 | if [ "$prefix_SET" = "yes" ] && [ ! "$rocks_tree_SET" = "yes" ] |
| 351 | then | 351 | then |
| 352 | ROCKS_TREE=$prefix | 352 | rocks_tree=$prefix |
| 353 | fi | 353 | fi |
| 354 | 354 | ||
| 355 | # ---------------------------------------- | 355 | # ---------------------------------------- |
| @@ -489,7 +489,7 @@ cat <<EOF > config.unix | |||
| 489 | 489 | ||
| 490 | prefix=$prefix | 490 | prefix=$prefix |
| 491 | luarocksconfdir=$luarocksconfdir | 491 | luarocksconfdir=$luarocksconfdir |
| 492 | ROCKS_TREE=$ROCKS_TREE | 492 | rocks_tree=$rocks_tree |
| 493 | LUA_VERSION=$LUA_VERSION | 493 | LUA_VERSION=$LUA_VERSION |
| 494 | LUA_INTERPRETER=$LUA_INTERPRETER | 494 | LUA_INTERPRETER=$LUA_INTERPRETER |
| 495 | LUA_DIR=$LUA_DIR | 495 | LUA_DIR=$LUA_DIR |
| @@ -520,7 +520,7 @@ BLUE "Done configuring." | |||
| 520 | echo | 520 | echo |
| 521 | echo | 521 | echo |
| 522 | echo "LuaRocks will be installed at......: $(GREEN "$prefix")" | 522 | echo "LuaRocks will be installed at......: $(GREEN "$prefix")" |
| 523 | echo "LuaRocks will install rocks at.....: $(GREEN "$ROCKS_TREE")" | 523 | echo "LuaRocks will install rocks at.....: $(GREEN "$rocks_tree")" |
| 524 | echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")" | 524 | echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")" |
| 525 | echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" | 525 | echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" |
| 526 | if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi | 526 | if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi |
| @@ -530,5 +530,5 @@ echo | |||
| 530 | echo "* Type $(BOLD make) and $(BOLD make install):" | 530 | echo "* Type $(BOLD make) and $(BOLD make install):" |
| 531 | echo " to install to $prefix as usual." | 531 | echo " to install to $prefix as usual." |
| 532 | echo "* Type $(BOLD make bootstrap):" | 532 | echo "* Type $(BOLD make bootstrap):" |
| 533 | echo " to install LuaRocks into $ROCKS_TREE as a rock." | 533 | echo " to install LuaRocks into $rocks_tree as a rock." |
| 534 | echo | 534 | echo |
