From 5fd68d9ce3174a33251f8965d8f1687354ba4814 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 14 Jan 2024 14:20:11 +0100 Subject: [PATCH] Keep the owner:group of the one downloading the tarball In the scenario: ./configure --prefix= make domserver sudo make-installdomserver 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. --- webapp/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/Makefile b/webapp/Makefile index 7c337993a9d..addcfbf5e70 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -12,16 +12,18 @@ SUBDIRS = config copy-bundle-assets: # 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 + -rm -rf public/bundles/nelmioapidoc/* mkdir -p public/bundles/nelmioapidoc - cp -R ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/ + cp -Ra ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/ clean-l: -rm -rf public/bundles/nelmioapidoc -install-domserver: +domserver-l: # This must be done first to install with the rest. $(MAKE) copy-bundle-assets + +install-domserver: $(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir); for d in bin config migrations public resources src templates tests ; do \ $(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \