From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 31 Aug 2008 16:46:31 +0000 (+0200)
Subject: properly search for lua includes and the library directory
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=commitdiff_plain;h=c7430fd3578af03d9fe998f3195756603295ce2f

properly search for lua includes and the library directory
---

diff --git a/lua/Makefile b/lua/Makefile
index 2861d21..7dbe696 100644
--- 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)