rename external/luasrc => external/lua

Makefile

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

config.mk

@@ -2,7 +2,7 @@ PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/man
 
 CC       = cc
-CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/luasrc
+CFLAGS   = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/lua
 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../luasrc
+CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../lua
 OBJS   = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o
 
 ##### End customisable sections #####

external/lua/ldblib.c

@@ -379,7 +379,7 @@ static int db_sethook (lua_State *L) {
   if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
     /* table just created; initialize it */
     lua_pushliteral(L, "k");
-    lua_setfield(L, -2, "__mode");  /* hooktable.__mode = "k" */
+    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
     lua_pushvalue(L, -1);
     lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
   }