From e63e7a77a2cb34f184be1beab35f65174e43d235 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Mon, 11 Mar 2024 12:37:50 +1300
Subject: [PATCH] tree: specify the lua/ directory for includes

---
 Makefile   | 3 ++-
 callisto.c | 6 +++---
 callisto.h | 2 +-
 csto.c     | 6 +++---
 lcl.c      | 4 ++--
 lenviron.c | 4 ++--
 lextra.c   | 4 ++--
 lfs.c      | 4 ++--
 ljson.c    | 4 ++--
 lprocess.c | 4 ++--
 util.c     | 4 ++--
 util.h     | 2 +-
 12 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index a7cf6f9..49c5b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,11 @@ include config.mk
 
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/man
+
 LUADIR = external/lua
 
 CC       = ${_CC}
-CFLAGS   = ${_CFLAGS} -I${LUADIR} -pedantic -Wall -Wextra
+CFLAGS   = ${_CFLAGS} -Iexternal -pedantic -Wall -Wextra
 CPPFLAGS = -D_DEFAULT_SOURCE ${_CPPFLAGS}
 LDFLAGS  = ${_LDFLAGS}
 
diff --git a/callisto.c b/callisto.c
index 6c24e47..03319cf 100644
--- a/callisto.c
+++ b/callisto.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2023-2024 Jeremy Baxter.
  */
 
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
+#include <lua/lualib.h>
 
 #include "callisto.h"
 
diff --git a/callisto.h b/callisto.h
index a9e7be1..f900042 100644
--- a/callisto.h
+++ b/callisto.h
@@ -6,7 +6,7 @@
 #ifndef _CALLISTO_H_
 #define _CALLISTO_H_
 
-#include <lua.h>
+#include <lua/lua.h>
 
 #define CALLISTO_VERSION_MAJOR		"0"
 #define CALLISTO_VERSION_MINOR		"1"
diff --git a/csto.c b/csto.c
index 16d8067..c31e866 100644
--- a/csto.c
+++ b/csto.c
@@ -10,9 +10,9 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
+#include <lua/lualib.h>
 
 #include "callisto.h"
 
diff --git a/lcl.c b/lcl.c
index 16b3b9d..8d01549 100644
--- a/lcl.c
+++ b/lcl.c
@@ -15,8 +15,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "util.h"
 
diff --git a/lenviron.c b/lenviron.c
index 05b2f85..33e235a 100644
--- a/lenviron.c
+++ b/lenviron.c
@@ -11,8 +11,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "callisto.h"
 
diff --git a/lextra.c b/lextra.c
index 2b70619..c37ba90 100644
--- a/lextra.c
+++ b/lextra.c
@@ -14,8 +14,8 @@
 
 #include <time.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 /***
  * Waits the specified amount of seconds.
diff --git a/lfs.c b/lfs.c
index 414bc62..24d5909 100644
--- a/lfs.c
+++ b/lfs.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "util.h"
 
diff --git a/ljson.c b/ljson.c
index f053a2e..22de29e 100644
--- a/ljson.c
+++ b/ljson.c
@@ -27,8 +27,8 @@
  * @module json
  */
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "callisto.h"
 
diff --git a/lprocess.c b/lprocess.c
index 956fbad..4a97f6b 100644
--- a/lprocess.c
+++ b/lprocess.c
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "util.h"
 
diff --git a/util.c b/util.c
index 38145e7..3db7ac7 100644
--- a/util.c
+++ b/util.c
@@ -12,8 +12,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
+#include <lua/lua.h>
 
 #include "util.h"
 
diff --git a/util.h b/util.h
index 76f7592..d58eb86 100644
--- a/util.h
+++ b/util.h
@@ -8,7 +8,7 @@
 
 #include <stddef.h>
 
-#include <lua.h>
+#include <lua/lua.h>
 
 int lfail(lua_State *);
 int lfailm(lua_State *, const char *);