Skip to content

Commit 5fd68d9

Browse files
committed
Keep the owner:group of the one downloading the tarball
In the scenario: ./configure --prefix=<something_which_needs_su/sudo> make domserver <as unpriviliged user which downloaded the tarball> sudo make-installdomserver <as root> We would copy the Nelmiodoc files as root, so the user can't run a make {dist}clean without errors as we can't remove the folder as its owned by root.
1 parent 63d10c9 commit 5fd68d9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

webapp/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ SUBDIRS = config
1212
copy-bundle-assets:
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
15+
-rm -rf public/bundles/nelmioapidoc/*
1616
mkdir -p public/bundles/nelmioapidoc
17-
cp -R ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
17+
cp -Ra ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
1818

1919
clean-l:
2020
-rm -rf public/bundles/nelmioapidoc
2121

22-
install-domserver:
22+
domserver-l:
2323
# This must be done first to install with the rest.
2424
$(MAKE) copy-bundle-assets
25+
26+
install-domserver:
2527
$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
2628
for d in bin config migrations public resources src templates tests ; do \
2729
$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \

0 commit comments

Comments
 (0)