Also fix the maintainer-install option

DOMjudge · Oct 27, 2024 · 215d4fe · 215d4fe
1 parent 098167f
commit 215d4fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ endif
 domserver: domserver-configure paths.mk config
 judgehost: judgehost-configure paths.mk config
 docs: paths.mk config
-install-domserver: domserver composer-dump-autoload domserver-create-dirs
+install-domserver: domserver domserver-create-dirs
 install-judgehost: judgehost judgehost-create-dirs
 install-docs: docs-create-dirs
 dist: configure composer-dependencies

diff --git a/webapp/Makefile b/webapp/Makefile
@@ -83,15 +83,24 @@ maintainer-conf: .env.local
 
 maintainer-install: composer-dump-autoload-dev
 
+maintainer-install-l:
+# This must be done first to install with the rest.
+	-rm -rf public/bundles/nelmioapidoc
+	$(MAKE) public/bundles/nelmioapidoc
+
 maintainer-clean-l:
 	-for d in cache log ; do \
 		for t in dev prod ; do \
 			rm -rf var/$$d/$$t ; \
 		done ; \
 	done
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 .PHONY: composer-dump-autoload-dev
 =======
 .PHONY: composer-dump-autoload composer-dump-autoload-dev
 >>>>>>> bfa038410 (Remove first phony target)
+=======
+.PHONY: composer-dump-autoload-dev
+>>>>>>> 4dd45d9cc (Replace phony copy-bundle-assets target by a real one)