move lua-5.4 -> external/luasrc

we have to use the name "luasrc" rather than just "lua" because lua
is in gitignore

Makefile

@@ -33,16 +33,15 @@ cjson.a: external/json/*.c
 	${MAKE} -Cexternal/json
 	mv -f external/json/cjson.a cjson.a
 
-liblua.a: lua-5.4/*.c
+liblua.a: external/luasrc/*.c
-	${MAKE} -Clua-5.4
+	${MAKE} -Cexternal/luasrc
-	mv -f lua-5.4/liblua.a .
+	mv -f external/luasrc/liblua.a .
 
 clean:
 	rm -f csto libcallisto.so ${OBJS} ${LIBS}
-	rm -fr include
+	rm -fr include doc/*.html doc/modules
-	rm -fr doc/*.html doc/modules
 clean-all: clean
-	${MAKE} -s -Clua-5.4 clean
+	${MAKE} -s -Cexternal/luasrc clean
 	${MAKE} -s -Cexternal/json clean
 
 doc:
@@ -52,8 +51,7 @@ install:
 	mkdir -p include/callisto
 	mkdir -p "${DESTDIR}${PREFIX}"/{bin,include,lib}
 	cp -f callisto.h include/callisto
-	cp -f lua-5.4/{lua.h,lualib.h,lauxlib.h,luaconf.h} \
+	cp -f external/luasrc/{lua.h,lualib.h,lauxlib.h,luaconf.h} include/callisto
-		include/callisto
 	cp -f csto "${DESTDIR}${PREFIX}"/bin
 	cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
 	cp -f libcallisto.so "${DESTDIR}${PREFIX}"/lib

config.mk

@@ -1,5 +1,5 @@
 CC       = cc
-CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -I. -Ilua-5.4
+CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/luasrc
 CPPFLAGS = -D_DEFAULT_SOURCE
 LDFLAGS = -lm
 

external/json/Makefile

@@ -13,7 +13,7 @@
 ##### Build defaults #####
 CC     = cc
 AR     = ar cr
-CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../../lua-5.4
+CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../luasrc
 OBJS   = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o
 
 ##### End customisable sections #####