From 9ebdbdb36a62ed9b82887a18df85d700da20dbf0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 4 Jan 2025 01:01:58 +0200 Subject: [PATCH] Makefile: fix frontend build Its make was moved to `serve` target in ccec612687137299c4c740449e9c8aa667865fbb, but we can't use `serve` target in the nix build It's also run after `frontend` target is already built which probably causes the `frontend` target to build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3159b93..ae86c3e 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ $(PUBLIC_DIR)/index.html: $(FRONTEND_DIR)/index.html $(PUBLIC_DIR) .PHONY: frontend backend frontend: $(PUBLIC_DIR)/index.html $(PUBLIC_DIR) + make -C $(FRONTEND_DIR) cp $(FRONTEND_DIR)/elm.min.js $(PUBLIC_DIR)/ cp $(FRONTEND_DIR)/src/ports.websocket.js $(PUBLIC_DIR)/ mkdir -p $(PUBLIC_DIR)/assets @@ -37,7 +38,6 @@ backend: $(CARGO_BUILD) --manifest-path=$(BACKEND_DIR)/Cargo.toml serve: frontend backend - make -C $(FRONTEND_DIR) ifeq ($(DEBUG),1) RUST_LOG=info,actix_web=debug $(CARGO_RUN) --manifest-path=$(BACKEND_DIR)/Cargo.toml else ifeq ($(RELEASE),1)