From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 21 Jul 2016 11:37:15 +0000 (+0100)
Subject: Introduce $(INSTALL_DIR) and use it in preference to mkdir
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b8fc9ccabb4e26707c42ad2e02554f3c24bcf68d;p=xtf.git

Introduce $(INSTALL_DIR) and use it in preference to mkdir

Include the -p parameters by default for $(INSTALL*) variables rather than
opencoding them everywhere.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/Makefile b/Makefile
index e21605d..45f3846 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,14 @@ export DESTDIR PREFIX
 CC              ?= $(CROSS_COMPILE)gcc
 CPP             ?= $(CC) -E
 INSTALL         ?= install
-INSTALL_DATA    ?= $(INSTALL) -m 644
-INSTALL_PROGRAM ?= $(INSTALL)
+INSTALL_DATA    ?= $(INSTALL) -m 644 -p
+INSTALL_DIR     ?= $(INSTALL) -d -p
+INSTALL_PROGRAM ?= $(INSTALL) -p
 LD              ?= $(CROSS_COMPILE)ld
 OBJCOPY         ?= $(CROSS_COMPILE)objcopy
 PYTHON          ?= python
 
-export CC CPP INSTALL INSTALL_DATA INSTALL_PROGRAM LD OBJCOPY PYTHON
+export CC CPP INSTALL INSTALL_DATA INSTALL_DIR INSTALL_PROGRAM LD OBJCOPY PYTHON
 
 .PHONY: all
 all:
@@ -27,8 +28,8 @@ all:
 
 .PHONY: install
 install:
-	@mkdir -p $(DESTDIR)
-	$(INSTALL_PROGRAM) -p xtf-runner $(DESTDIR)
+	@$(INSTALL_DIR) $(DESTDIR)
+	$(INSTALL_PROGRAM) xtf-runner $(DESTDIR)
 	@set -e; for D in $(wildcard tests/*); do \
 		[ ! -e $$D/Makefile ] && continue; \
 		$(MAKE) -C $$D install; \
diff --git a/build/gen.mk b/build/gen.mk
index 790212b..0a172b3 100644
--- a/build/gen.mk
+++ b/build/gen.mk
@@ -31,8 +31,8 @@ test-info.json: $(ROOT)/build/mkinfo.py FORCE
 
 .PHONY: install install-each-env
 install: install-each-env test-info.json
-	@mkdir -p $(DESTDIR)/tests/$(NAME)
-	$(INSTALL_DATA) -p test-info.json $(DESTDIR)/tests/$(NAME)
+	@$(INSTALL_DIR) $(DESTDIR)/tests/$(NAME)
+	$(INSTALL_DATA) test-info.json $(DESTDIR)/tests/$(NAME)
 
 define PERENV_build
 
@@ -63,12 +63,12 @@ test-$(1)-$(NAME).cfg: $$(cfg-$(1)) FORCE
 
 .PHONY: install-$(1) install-$(1).cfg
 install-$(1): test-$(1)-$(NAME)
-	@mkdir -p $(DESTDIR)/tests/$(NAME)
-	$(INSTALL_PROGRAM) -p $$< $(DESTDIR)/tests/$(NAME)
+	@$(INSTALL_DIR) $(DESTDIR)/tests/$(NAME)
+	$(INSTALL_PROGRAM) $$< $(DESTDIR)/tests/$(NAME)
 
 install-$(1).cfg: test-$(1)-$(NAME).cfg
-	@mkdir -p $(DESTDIR)/tests/$(NAME)
-	$(INSTALL_DATA) -p $$< $(DESTDIR)/tests/$(NAME)
+	@$(INSTALL_DIR) $(DESTDIR)/tests/$(NAME)
+	$(INSTALL_DATA) $$< $(DESTDIR)/tests/$(NAME)
 
 install-each-env: install-$(1) install-$(1).cfg