From d9bd7def0bb96c13295878ac567a3f6cd86e360f Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sun, 8 Sep 2019 18:36:58 -0400 Subject: [PATCH] Fix autotools lua detection --- configure.ac | 2 +- src/libresrc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 58dc23f8d..9cc9eaf53 100644 --- a/configure.ac +++ b/configure.ac @@ -435,7 +435,7 @@ AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1]) # If the user doesn't have an installed copy of Lua, just use the one built # as part of building LuaJIT -AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"]) +AS_IF([test -z $LUA], [LUA='$(TOP)vendor/luajit/src/host/minilua']) ###################################################### # Debugging support diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile index 6058ff9a3..8b6d19595 100644 --- a/src/libresrc/Makefile +++ b/src/libresrc/Makefile @@ -10,7 +10,7 @@ resrc_OBJ := \ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp -RESPACK := cd $(TOP)src/libresrc; $(TOP)$(BIN_LUA) $(TOP)tools/respack.lua +RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua $(d)bitmap.cpp: $(d)bitmap.h $(d)default_config.cpp: $(d)default_config.h