diff --git a/bmake.mk b/bmake.mk index 24f9245..56ea768 100644 --- a/bmake.mk +++ b/bmake.mk @@ -124,7 +124,7 @@ ${.CURDIR}/obj/release/server/${_src:S/.c$/.o/}: ${_src} .-include "obj/release/gl/*.d" .-include "obj/release/server/*.d" -install: +install: release install -d ${PREFIX}/bin install -m 755 ${.CURDIR}/${BIN_DIR}/release/${CLIENT_BIN} ${PREFIX}/bin/${CLIENT_BIN} install -m 755 ${.CURDIR}/${BIN_DIR}/release/${GLCLIENT_BIN} ${PREFIX}/bin/${GLCLIENT_BIN} diff --git a/build.bat b/build.bat index 8486fd1..1b10fd0 100644 --- a/build.bat +++ b/build.bat @@ -1,16 +1,6 @@ @echo off setlocal -set HAS_INSTALL=0 -for %%a in (%*) do ( - if "%%a"=="install" set HAS_INSTALL=1 -) - -if "%HAS_INSTALL%"=="1" ( - make -f gmake.mk release - if errorlevel 1 exit /b 1 -) - if "%1"=="run" ( if "%2"=="" ( make -f gmake.mk run MODE=debug diff --git a/build.sh b/build.sh index 55b35b7..3cb086d 100755 --- a/build.sh +++ b/build.sh @@ -34,10 +34,6 @@ for arg in "$@"; do done if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then - if [ "$HAS_INSTALL" = "1" ]; then - make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR - fi - if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then PRIV="" elif command -v doas > /dev/null 2>&1; then diff --git a/gmake.mk b/gmake.mk index 63c2261..56536bc 100644 --- a/gmake.mk +++ b/gmake.mk @@ -174,7 +174,7 @@ obj/release/server/%.o: %.c -include $(wildcard obj/release/gl/*.d) -include $(wildcard obj/release/server/*.d) -install: +install: release install -d $(PREFIX)/bin install -m 755 $(BIN_DIR)/release/$(CLIENT_BIN) $(PREFIX)/bin/$(CLIENT_BIN) install -m 755 $(BIN_DIR)/release/$(GLCLIENT_BIN) $(PREFIX)/bin/$(GLCLIENT_BIN)