aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-06-04 10:07:51 +0200
committerLukas Larsson <[email protected]>2018-06-04 10:07:51 +0200
commitd2ff90ccc987755653dc129b0e96b0d11b669cd5 (patch)
treed46cc492202eeb39af7791fa81accaf48d08e38f
parentc08d7b0e61f3763726c0d6564d57fab195026b0b (diff)
parent6365a98f3a256adb62a05cc8644fa39b0aaf963f (diff)
downloadotp-d2ff90ccc987755653dc129b0e96b0d11b669cd5.tar.gz
otp-d2ff90ccc987755653dc129b0e96b0d11b669cd5.tar.bz2
otp-d2ff90ccc987755653dc129b0e96b0d11b669cd5.zip
Merge branch 'lukas/otp/fix-mkdir-makefile-error'
-rw-r--r--erts/emulator/Makefile.in2
-rw-r--r--erts/lib_src/Makefile.in2
-rw-r--r--make/otp_release_targets.mk2
3 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 221cf84622..054692819e 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -517,7 +517,9 @@ release_docs_spec:
# Generated source code. Put in $(TARGET) directory
#
+ifneq ($(strip $(CREATE_DIRS)),)
_create_dirs := $(shell mkdir -p $(CREATE_DIRS))
+endif
# has to be run after _create_dirs
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index 48660f7c71..dfaf664a18 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -334,7 +334,7 @@ ETHREAD_LIB=
endif
-ifneq ($(CREATE_DIRS),)
+ifneq ($(strip $(CREATE_DIRS)),)
_create_dirs := $(shell mkdir -p $(CREATE_DIRS))
endif
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 779aaa1a1e..f57116569c 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -36,7 +36,9 @@ endif
# -------------------------------------------------------
# Take the XML files and add the github link info to them
# -------------------------------------------------------
+ifneq ($(strip $(XMLDIR)),)
_create_xml_dirs := $(shell mkdir -p $(XMLDIR))
+endif
XML_GEN_FILES+=$(patsubst %.xml,$(XMLDIR)/%.xml,$(XML_FILES))
$(XMLDIR)/%.xml: %.xml