Replace phony copy-bundle-assets target by a real one

eldering · eldering · commit c8b613dae11a · 2024-03-16T17:36:14.000+01:00
This makes that we don't rerun the rule during
`domserver-install` if it already ran during `domserver`, so
that if you install as root, the local files are still owned
by the user who first ran `make domserver`, not root.

This does assume that if the directory `public/bundles/nelmioapidoc`
exists, then it contains the assets, and these won't automatically
get updated, for example, in the setting of a maintainer-install.
diff --git a/webapp/Makefile b/webapp/Makefile
@@ -9,19 +9,16 @@ include $(TOPDIR)/Makefile.global
 # Subdirectories to recurse into for REC_TARGETS
 SUBDIRS = config
 
-copy-bundle-assets:
+public/bundles/nelmioapidoc:
 # We can not use bin/console here, as when using a fakeroot,
 # the include paths are broken. We just copy in the data we need
-	-rm -rf public/bundles/nelmioapidoc
-	mkdir -p public/bundles/nelmioapidoc
-	cp -a ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
+	mkdir -p $@
+	cp -a ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* $@
 
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
 
-domserver-l:
-# This must be done first to install with the rest.
-	$(MAKE) copy-bundle-assets
+domserver-l: public/bundles/nelmioapidoc
 
 install-domserver:
 	$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
@@ -48,5 +45,3 @@ maintainer-clean-l:
 			rm -rf var/$$d/$$t ; \
 		done ; \
 	done
-
-.PHONY: copy-bundle-assets
