configure, make: reduce moving parts

* Do not set again variables that were set in config.unix
* Do not re-detect the Lua version after configure already did it
* Remove --luarocksconfdir, use --sysconfdir only

1 files changed, 12 insertions, 22 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 90ceaf87..a2a13e04 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,29 +1,19 @@
 
 -include config.unix
 
-# See https://www.gnu.org/software/make/manual/html_node/Makefile-Conventions.html
-prefix ?= /usr/local
-datarootdir ?= $(prefix)/share
-bindir ?= $(prefix)/bin
-sysconfdir ?= $(prefix)/etc
-INSTALL ?= install
-INSTALL_DATA ?= $(INSTALL) -m 644
-BINARY_PLATFORM ?= unix
-
-LUA_INTERPRETER ?= lua
-ifdef LUA_BINDIR
-LUA = $(LUA_BINDIR)/$(LUA_INTERPRETER)
+datarootdir = $(prefix)/share
+bindir = $(prefix)/bin
+sysconfdir = $(prefix)/etc
+INSTALL = install
+INSTALL_DATA = $(INSTALL) -m 644
+BINARY_PLATFORM = unix
+
 SHEBANG = \#!$(LUA_BINDIR)/$(LUA_INTERPRETER)
-else
-LUA = $(LUA_INTERPRETER)
-SHEBANG = \#!/usr/bin/env $(LUA_INTERPRETER)
-endif
-LUA_VERSION ?= $(shell $(LUA) -e 'print(_VERSION:match(" (5%.[1234])$$"))')
-rocks_tree ?= $(prefix)
-luarocksconfdir ?= $(sysconfdir)/luarocks
-luadir ?= $(datarootdir)/lua/$(LUA_VERSION)
-builddir ?= ./build
-buildbinarydir ?= ./build-binary
+LUA = $(LUA_BINDIR)/$(LUA_INTERPRETER)
+luarocksconfdir = $(sysconfdir)/luarocks
+luadir = $(datarootdir)/lua/$(LUA_VERSION)
+builddir = ./build
+buildbinarydir = ./build-binary
 
 
 LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua')