From 8f5818b925d53151dbd8c982b0ee63080c72e0ef Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Thu, 29 Feb 2024 17:35:44 +1300
Subject: [PATCH] makefile: fix build on posix shells

Remove use of the `dir/{file,file}' syntax.
---
 .gitignore |  1 -
 Makefile   | 14 +++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d9dc5f..e026ece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ luac
 result
 
 config.mk
-include/
diff --git a/Makefile b/Makefile
index 0887caf..a7cf6f9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,11 @@ LDFLAGS  = ${_LDFLAGS}
 OBJS = callisto.o lcl.o lenviron.o lextra.o lfs.o ljson.o \
        lprocess.o util.o
 LIBS = liblua.a
+HEADERS = callisto.h \
+	${LUADIR}/lua.h \
+	${LUADIR}/luaconf.h \
+	${LUADIR}/lualib.h \
+	${LUADIR}/lauxlib.h
 
 CJSON_SRC    = external/json
 CJSON_OBJS   = fpconv.o lua_cjson.o strbuf.o
@@ -61,12 +66,11 @@ doc:
 	ldoc -s . -q . >/dev/null
 
 install:
-	mkdir -p include/callisto
-	mkdir -p "${DESTDIR}${PREFIX}"/{bin,include,lib}
-	cp -f callisto.h include/callisto
-	cp -f external/lua/{lua.h,lualib.h,lauxlib.h,luaconf.h} include/callisto
+	mkdir -p "${DESTDIR}${PREFIX}"/bin
+	mkdir -p "${DESTDIR}${PREFIX}"/include/callisto
+	mkdir -p "${DESTDIR}${PREFIX}"/lib
+	cp -f ${HEADERS} "${DESTDIR}${PREFIX}"/include/callisto
 	cp -f csto "${DESTDIR}${PREFIX}"/bin
-	cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
 	cp -f libcallisto.a "${DESTDIR}${PREFIX}"/lib
 
 .PHONY: all clean doc install