properly search for lua includes and the library directory

diff --git a/lua/Makefile b/lua/Makefile
index 2861d215619638b58db45c21a5ef798ca976ae02..7dbe6964b14e81a33c2afa5965dca7983e8de13d 100644 (file)
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -1,10 +1,25 @@
 include ../Makefile.inc
-prefix=/usr/local
-libdir=$(prefix)/lib
-luadir=$(libdir)/lua/5.1
+LUA_VERSION=5.1
+PREFIX_SEARCH=/usr /usr/local /opt/local
+LUA_PLUGINDIR=$(firstword \
+       $(foreach ldir,$(subst ;, ,$(shell lua -e 'print(package.cpath)')), \
+               $(if $(findstring lib/lua/,$(ldir)),$(patsubst %/?.so,%,$(ldir))) \
+       ) \
+)
 
-CPPFLAGS=-I.. $(shell pkg-config --silence-errors --cflags lua5.1)
-LIBS=-L.. -luci $(shell pkg-config --silence-errors --libs lua5.1)
+# find lua prefix
+LUA_PREFIX=$(firstword \
+       $(foreach prefix,$(PREFIX_SEARCH),\
+               $(if $(wildcard $(prefix)/include/lua.h),$(prefix)) \
+       ) \
+)
+
+libdir=$(prefix)/libs
+luadir=$(if $(LUA_PLUGINDIR),$(LUA_PLUGINDIR),$(libdir)/lua/$(LUA_VERSION))
+luainc=$(shell pkg-config --silence-errors --cflags lua$(LUA_VERSION))
+
+CPPFLAGS=-I.. -I$(if $(luainc),$(luainc),$(LUA_PREFIX)/include)
+LIBS=-L.. -luci $(shell pkg-config --silence-errors --libs lua$(LUA_VERSION))
 
 PLUGIN_LD=$(CC)
 ifeq ($(OS),Darwin)