Remove use of shell test command for making decisions

1 files changed, 36 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index a3b8ba5..b90f372 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,21 @@ all: lua-5.1-try lua-5.2-try
 install: lua-5.1-try-install lua-5.2-try-install
 
 # This isn't nice.  Find a nice way.
-EXTRA_LIBS := $(shell test x`uname -s` == xLinux && echo -lrt)
+HOST_OS := $(shell uname -s)
+
+ifeq ($(HOST_OS),Linux)
+  EXTRA_LIBS := -lrt
+else
+  EXTRA_LIBS :=
+endif
+
+NAKED_LUA_VER := $(shell pkg-config --variable V lua)
 
 # fine appropriate Lua interpreter
 LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) || \
                     (which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) || \
                     (which lua51  > /dev/null 2>&1 && echo lua51) || \
-                    (lua -v | grep -q 5.1 && lua) || \
+                    (lua -e"print(_VERSION)" | grep -q 5.1 && echo lua) || \
                     (which lua-5.2 > /dev/null 2>&1 && echo lua-5.2) || \
                     (which lua52 > /dev/null 2>&1 && echo lua52))
 
@@ -17,9 +25,19 @@ LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) || \
 LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
                      (pkg-config --exists lua-5.1 && echo lua-5.1) || \
 		     (pkg-config --exists lua51 && echo lua51) || \
-                     (test x`pkg-config --variable=V  lua` == x5.1  && echo lua))
-LUA51_HAS_MODINST := $(shell (test x`pkg-config --variable INSTALL_LMOD $LUA51_PKG` != x && echo YES))
-ifneq ($(LUA51_PKG),)
+                     (echo "NONE"))
+
+LUA51_PKG := $(strip $(LUA51_PKG))
+
+ifeq ($(LUA51_PKG),NONE)
+  ifeq ($(NAKED_LUA_VER),5.1)
+    LUA51_PKG := lua
+  endif
+endif
+
+ifneq ($(LUA51_PKG),NONE)
+  $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
+  LUA51_HAS_MODINST := $(shell (test x`pkg-config --variable INSTALL_LMOD $LUA51_PKG` != x && echo YES))
   LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
   LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
   ifeq ($(LUA51_HAS_MODINST),)
@@ -44,9 +62,19 @@ endif
 LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
                      (pkg-config --exists lua-5.2 && echo lua-5.2) || \
                      (pkg-config --exists lua52 && echo lua52) || \
-                     (test x`pkg-config --variable=V  lua` == x5.2  && echo lua))
-LUA52_HAS_MODINST := $(shell (test x`pkg-config --variable INSTALL_LMOD $LUA52_PKG` != x && echo YES))
-ifneq ($(LUA52_PKG),)
+                     (echo "NONE")) 
+
+LUA52_PKG := $(strip $(LUA52_PKG))
+
+ifeq ($(LUA52_PKG),NONE)
+  ifeq ($(NAKED_LUA_VER),5.2)
+    LUA52_PKG := lua
+  endif
+endif
+
+ifneq ($(LUA52_PKG),NONE)
+  $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
+  LUA52_HAS_MODINST := $(shell (test x`pkg-config --variable INSTALL_LMOD $LUA52_PKG` != x && echo YES))
   LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
   LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
   ifeq ($(LUA52_HAS_MODINST),)