From 8ef7d5dbcf78a7a0ad559df33862b85fc5f91cbc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 21 Jul 2014 10:37:51 +0000 Subject: [PATCH] subtree.mk: Make subtree.mk work Signed-off-by: Jan Lindemann --- make/subtree.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/subtree.mk b/make/subtree.mk index 2ad55916..f90f25ef 100644 --- a/make/subtree.mk +++ b/make/subtree.mk @@ -4,7 +4,7 @@ SUBTREE_MODE ?= 0644 SUBTREE_DIROWNER ?= root SUBTREE_DIRGROUP ?= root SUBTREE_DIRMODE ?= 0755 -SUBTREE_INSTALL_PREFIX = /tmp/blah +SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) SUBTREE_DIRS = $(shell for f in `git ls-files . | sed 's%/[^/]\+$$%%' | sort -u | grep -v Makefile`; do if [ -d "$$f" ]; then echo $$f; fi; done) SUBTREE_FILES = $(shell for f in `git ls-files . | grep -v Makefile`; do if [ -f "$$f" ]; then echo $$f; fi; done) @@ -19,8 +19,8 @@ clean: distclean: $(INSTALLED_SUBTREE_DIRS): - @echo $(INSTALL) -d -o $(SUBTREE_DIROWNER) -g $(SUBTREE_DIRGROUP) -m $(SUBTREE_DIRMODE) $@ + $(INSTALL) -d -o $(SUBTREE_DIROWNER) -g $(SUBTREE_DIRGROUP) -m $(SUBTREE_DIRMODE) $@ $(SUBTREE_INSTALL_PREFIX)/%: % - @echo $(INSTALL) -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@ + $(INSTALL) -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@