Merge pull request #405 from NiLuJe/master

Unfuck my previous LUA_LIBDIR change for lua-Spore
koreader · Apr 13, 2016 · 3ca13f3 · 3ca13f3
2 parents 8e39d61 + 5558703
commit 3ca13f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile.third b/Makefile.third
@@ -456,7 +456,7 @@ $(LUA_SPORE_ROCK): $(THIRDPARTY_DIR)/lua-Spore/CMakeLists.txt
 		$(CMAKE) -DOUTPUT_DIR="$(CURDIR)/$(OUTPUT_DIR)" \
 		-DLUA_SPORE_VER=$(LUA_SPORE_VER) -DLD="$(CC)" \
 		-DCC="$(CC)" -DCFLAGS="$(CFLAGS) -I$(LUAJIT_DIR)/src" \
-		-DLUA_INCDIR="$(LUAJIT_DIR)/src" -DLUA_LIBDIR="$(CURDIR)/$(LUAJIT_LIB)" \
+		-DLUA_INCDIR="$(LUAJIT_DIR)/src" -DLUA_LIBDIR="$(CURDIR)/$(dir $(LUAJIT_LIB))" \
 		$(if $(ANDROID),-DLDFLAGS="$(LDFLAGS) $(CURDIR)/$(LUAJIT_LIB)",) \
 		$(CURDIR)/$(THIRDPARTY_DIR)/lua-Spore && \
 		$(MAKE)