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 e21605de342fb2951e3934d9b0e203ebd6693cf7..45f384698cfcbdc1e4d11a80f8efb082571f77d1 100644 (file)
--- 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 790212bed9e0a404f512a40dee4a37b2d83d25ad..0a172b36ea1e9a5f51b129412b015e8dd4cb0c74 100644 (file)
--- 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