jeremy/callisto
1
Fork 0
Code Releases Activity

Fix merge conflict in .gitignore

Browse source
This commit is contained in:
Jeremy Baxter 2023-07-24 13:24:06 +12:00
parent 02fae90b69
commit 75aaaf922f
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,6 +3,7 @@
*.so *.so
csto csto
doc/ doc/
include/
test.lua test.lua
lua lua

7
Makefile
View file

@ -53,11 +53,12 @@ doc:
install: install:
mkdir -p include/callisto 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 callisto.h include/callisto
cp -f lua-5.4/{lua.h,lualib.h,lauxlib.h,luaconf.h} \ cp -f lua-5.4/{lua.h,lualib.h,lauxlib.h,luaconf.h} \
include/callisto include/callisto
cp -f csto ${DESTDIR}${PREFIX}/bin cp -f csto "${DESTDIR}${PREFIX}"/bin
cp -f libcallisto.so ${DESTDIR}${PREFIX}/lib cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
cp -f libcallisto.so "${DESTDIR}${PREFIX}"/lib
.PHONY: all clean doc install .PHONY: all clean doc install