From bdeb2be59b68795b415e36e9d1b0aa9263d6197d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 16 May 2019 15:39:27 +0000 Subject: [PATCH] subtree.mk: Files were RPM-shipped with development user id Signed-off-by: Jan Lindemann --- make/subtree.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/make/subtree.mk b/make/subtree.mk index d3e1e96b..e86f40e5 100644 --- a/make/subtree.mk +++ b/make/subtree.mk @@ -1,22 +1,22 @@ -ifeq ($(DEVELOPMENT),false) -SUBTREE_OWNER ?= root -SUBTREE_GROUP ?= root -SUBTREE_MODE ?= 0644 -SUBTREE_DIROWNER ?= root -SUBTREE_DIRGROUP ?= root -SUBTREE_DIRMODE ?= 0755 +ifneq ($(DEVELOPMENT),true) + SUBTREE_OWNER ?= root + SUBTREE_GROUP ?= root + SUBTREE_MODE ?= 0644 + SUBTREE_DIROWNER ?= root + SUBTREE_DIRGROUP ?= root + SUBTREE_DIRMODE ?= 0755 else -SUBTREE_OWNER ?= $(shell id -un) -SUBTREE_GROUP ?= $(shell id -gn) -SUBTREE_MODE ?= 0644 -SUBTREE_DIROWNER ?= $(shell id -un) -SUBTREE_DIRGROUP ?= $(shell id -gn) -SUBTREE_DIRMODE ?= 0755 -SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) + SUBTREE_OWNER ?= $(shell id -un) + SUBTREE_GROUP ?= $(shell id -gn) + SUBTREE_MODE ?= 0644 + SUBTREE_DIROWNER ?= $(shell id -un) + SUBTREE_DIRGROUP ?= $(shell id -gn) + SUBTREE_DIRMODE ?= 0755 + SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) endif #ifeq ($(SUBTREE_SRC),) -#SUBTREE_SRC = $(shell find .) +# SUBTREE_SRC = $(shell find .) #endif SUBTREE_DIRS += $(shell for f in `git ls-files . 2>/dev/null || find | sed 's%/[^/]\+$$%%' | sort -u | grep -v "Makefile\|GNUmakefile"`; do if [ -d "$$f" ]; then echo $$f; fi; done)