Skip to content

Commit c8b613d

Browse files
committed
Replace phony copy-bundle-assets target by a real one
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.
1 parent c7c5b81 commit c8b613d

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

webapp/Makefile

+4-9
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@ include $(TOPDIR)/Makefile.global
99
# Subdirectories to recurse into for REC_TARGETS
1010
SUBDIRS = config
1111

12-
copy-bundle-assets:
12+
public/bundles/nelmioapidoc:
1313
# We can not use bin/console here, as when using a fakeroot,
1414
# the include paths are broken. We just copy in the data we need
15-
-rm -rf public/bundles/nelmioapidoc
16-
mkdir -p public/bundles/nelmioapidoc
17-
cp -a ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
15+
mkdir -p $@
16+
cp -a ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* $@
1817

1918
clean-l:
2019
-rm -rf public/bundles/nelmioapidoc
2120

22-
domserver-l:
23-
# This must be done first to install with the rest.
24-
$(MAKE) copy-bundle-assets
21+
domserver-l: public/bundles/nelmioapidoc
2522

2623
install-domserver:
2724
$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
@@ -48,5 +45,3 @@ maintainer-clean-l:
4845
rm -rf var/$$d/$$t ; \
4946
done ; \
5047
done
51-
52-
.PHONY: copy-bundle-assets

0 commit comments

Comments
 (0)