From 8d0f2bcb07f4be15c30e515c80941c80703b6113 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 27 May 2008 10:57:58 +0200 Subject: [PATCH] [build] Use good path to Lua interpreter Signed-off-by: Julien Danjou --- Makefile.am | 2 +- configure.ac | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 983ef129..4d7894e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,7 +199,7 @@ CLEANFILES += apidocgen.txt BUILT_SOURCES += apidocgen.txt APIDOCSOURCES=$(shell grep -l 'const struct luaL_reg' $(awesome_SOURCES)) apidocgen.txt: $(APIDOCSOURCES) build-utils/gendoc.lua - cat $(APIDOCSOURCES) | $(top_srcdir)/build-utils/gendoc.lua > apidocgen.txt + cat $(APIDOCSOURCES) | $(LUA) $(top_srcdir)/build-utils/gendoc.lua > apidocgen.txt .1.txt.1.xml: $(ASCIIDOC) -d manpage -b docbook -o $@ $< awesomerc.5.xml: apidocgen.txt diff --git a/configure.ac b/configure.ac index 22c1e007..6ce9ae4c 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,10 @@ AC_PATH_PROG([WHOAMI], [whoami], [false]) AS_IF([test "x$WHOAMI" = "xfalse"], [aw_whoami="???"], [aw_whoami=`$WHOAMI`]) AC_DEFINE_UNQUOTED([AWESOME_COMPILE_BY], ["$aw_whoami"], [build user]) +AC_ARG_VAR([LUA], [Lua interpreter]) +AC_PATH_PROG([LUA], [lua], [:]) +test "x$LUA" = "x:" && AC_MSG_WARN([awesome compilation requires Lua]) + AS_AC_EXPAND(awesomelibdir, "$datarootdir/awesome/lib") AC_DEFINE_UNQUOTED([AWESOME_LUA_LIB_PATH], "${awesomelibdir}", [awesome lib path])