From 75aaaf922f7321b259db4184e30999eb1180d105 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Mon, 24 Jul 2023 13:24:06 +1200
Subject: [PATCH] Fix merge conflict in .gitignore

---
 .gitignore | 1 +
 Makefile   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f94ca4e..cf6e38f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.so
 csto
 doc/
+include/
 test.lua
 
 lua
diff --git a/Makefile b/Makefile
index bb2d3e1..037c339 100644
--- a/Makefile
+++ b/Makefile
@@ -53,11 +53,12 @@ doc:
 
 install:
 	mkdir -p include/callisto
-	mkdir -p ${DESTDIR}${PREFIX}/{bin,lib}
+	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} \
 		include/callisto
-	cp -f csto ${DESTDIR}${PREFIX}/bin
-	cp -f libcallisto.so ${DESTDIR}${PREFIX}/lib
+	cp -f csto "${DESTDIR}${PREFIX}"/bin
+	cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
+	cp -f libcallisto.so "${DESTDIR}${PREFIX}"/lib
 
 .PHONY: all clean doc install