From 2bcacef5bc91e1bcdc7fdc7ef2df00c34d641e7b Mon Sep 17 00:00:00 2001
From: Ilona Podliashanyk <ilona.podliashanyk@sikt.no>
Date: Tue, 5 Mar 2024 12:44:45 +0100
Subject: [PATCH] Update sass related make cmds after changing file structure

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 128ba99eaf..123fe87f0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: dummy clean distclean testclean docclean doc cssclean webpacksass .FORCE
+.PHONY: dummy clean distclean testclean docclean doc cssclean sassbuild sasswatch .FORCE
 
 dummy:
 	@echo "'make' is no longer used for deployment. See 'doc/intro/install.rst'"
@@ -30,8 +30,10 @@ doc/reference/alerttypes.rst: .FORCE
 cssclean:
 	-rm -rf python/nav/web/static/css
 
-webpacksass: cssclean
-	-(cd python/nav/web/static/js && npm install && npm run build:sass:prod)
-	-echo "\n *** Manually disable running of setuptool's build_sass command and sass-watch.sh script. Then run docker-compose up to test web app with CSS files built by Webpack. *** \n"
+sassbuild: cssclean
+	-(cd frontend && npm ci && npm run build:sass:prod)
+
+sasswatch:
+	-(cd frontend && npm run build:sass:prod)
 
 .FORCE: