fix: install depends on release instead of relying on build.sh order

clean+install in one invocation wiped the release build before install
ran. install now has a real release prerequisite so make's own
dependency graph handles rebuilds regardless of target order; the
redundant manual pre-build in build.sh/build.bat is removed.
This commit is contained in:
anth64 committed 2026-11-14 15:41:29 +01:00
1 parent 6a09d376c3
commit a88b87653e
4 files changed
+2 -16

No files matched your search

+1 -1
View File
@@ -124,7 +124,7 @@ ${.CURDIR}/obj/release/server/${_src:S/.c$/.o/}: ${_src}
.-include "obj/release/gl/*.d" .-include "obj/release/gl/*.d"
.-include "obj/release/server/*.d" .-include "obj/release/server/*.d"
install: install: release
install -d ${PREFIX}/bin install -d ${PREFIX}/bin
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${CLIENT_BIN} ${PREFIX}/bin/${CLIENT_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} install -m 755 ${.CURDIR}/${BIN_DIR}/release/${GLCLIENT_BIN} ${PREFIX}/bin/${GLCLIENT_BIN}
-10
View File
@@ -1,16 +1,6 @@
@echo off @echo off
setlocal 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 "%1"=="run" (
if "%2"=="" ( if "%2"=="" (
make -f gmake.mk run MODE=debug make -f gmake.mk run MODE=debug
-4
View File
@@ -34,10 +34,6 @@ for arg in "$@"; do
done done
if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then 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 if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
PRIV="" PRIV=""
elif command -v doas > /dev/null 2>&1; then elif command -v doas > /dev/null 2>&1; then
+1 -1
View File
@@ -174,7 +174,7 @@ obj/release/server/%.o: %.c
-include $(wildcard obj/release/gl/*.d) -include $(wildcard obj/release/gl/*.d)
-include $(wildcard obj/release/server/*.d) -include $(wildcard obj/release/server/*.d)
install: install: release
install -d $(PREFIX)/bin install -d $(PREFIX)/bin
install -m 755 $(BIN_DIR)/release/$(CLIENT_BIN) $(PREFIX)/bin/$(CLIENT_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) install -m 755 $(BIN_DIR)/release/$(GLCLIENT_BIN) $(PREFIX)/bin/$(GLCLIENT_BIN)