changeset 52994:dea8a62cdfc3

8211724: Change mkdir -p to MakeDir macro where possible Reviewed-by: ihse, asemenyuk
author erikj
date Tue, 09 Oct 2018 14:57:23 -0700
parents 50ef71b6fd3d
children 49a21be61dcd
files make/BuildStatic.gmk make/Bundles.gmk make/CopyInterimCLDRConverter.gmk make/CreateBuildJdkCopy.gmk make/GenerateModuleSummary.gmk make/GensrcModuleInfo.gmk make/MacBundles.gmk make/autoconf/basics.m4 make/common/JarArchive.gmk make/common/JavaCompilation.gmk make/common/Modules.gmk make/common/ZipArchive.gmk make/copy/Copy-java.base.gmk make/gendata/GendataFontConfig.gmk make/gendata/GendataHtml32dtd.gmk make/gendata/GendataTZDB.gmk make/gensrc/GensrcCLDR.gmk make/gensrc/GensrcCharsetCoder.gmk make/gensrc/GensrcCommonLangtools.gmk make/gensrc/GensrcLocaleData.gmk make/gensrc/GensrcModuleLoaderMap.gmk make/gensrc/GensrcProperties.gmk make/gensrc/GensrcSwing.gmk make/launcher/Launcher-java.base.gmk make/rmic/Rmic-java.management.rmi.gmk
diffstat 25 files changed, 41 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/make/BuildStatic.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/BuildStatic.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -42,7 +42,7 @@
 
 $(GLOBAL_SYMBOLS_FILE): $(MODULES_SYMBOLS_FILES)
 	$(call LogInfo, Generating global exported.symbols file)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(CAT) $^ > $@
 
 TARGETS += $(GLOBAL_SYMBOLS_FILE)
--- a/make/Bundles.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/Bundles.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -70,6 +70,7 @@
   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
 
   $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
+	$$(call MakeTargetDir)
         # If any of the files contain a space in the file name, CacheFind
         # will have replaced it with ?. Tar does not accept that so need to
         # switch it back.
@@ -79,7 +80,6 @@
 	  $$(CAT) $$($1_$$d_LIST_FILE) | $$(TR) '?' ' ' > $$($1_$$d_LIST_FILE).tmp \
 	      && $(MV) $$($1_$$d_LIST_FILE).tmp $$($1_$$d_LIST_FILE) $$(NEWLINE) \
 	)
-	$$(call MakeDir, $$(@D))
         ifneq ($$($1_SPECIAL_INCLUDES), )
 	  $$(foreach i, $$($1_SPECIAL_INCLUDES), \
 	    $$(foreach d, $$($1_BASE_DIRS), \
--- a/make/CopyInterimCLDRConverter.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/CopyInterimCLDRConverter.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -33,7 +33,7 @@
 ### CLDRConverter needs the JRE time zone names from the java.base source.
 
 define cldrconverter_copytznames
-	$(MKDIR) -p '$(@D)'
+	$(call MakeTargetDir)
 	$(RM) '$@'
 	$(SED) -e "s/package sun.util.resources/package build.tools.cldrconverter/" \
         -e "s/extends TimeZoneNamesBundle//" \
@@ -46,7 +46,7 @@
     DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes/build/tools/cldrconverter, \
     FILES := TimeZoneNames.java, \
     MACRO := cldrconverter_copytznames))
-    
+
 ##########################################################################################
 
 all: $(COPY_INTERIM_CLDRCONVERTER)
--- a/make/CreateBuildJdkCopy.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/CreateBuildJdkCopy.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -41,7 +41,7 @@
 
 $(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \
     $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
-	$(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
+	$(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY))
 	$(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
 	$(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
 	$(foreach m, $(MODULES_TO_COPY), \
--- a/make/GenerateModuleSummary.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/GenerateModuleSummary.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -35,18 +35,18 @@
 TOOLS_MODULE_SRCDIR := $(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw
 
 $(GENGRAPHS_DIR)/jdk.dot: $(BUILD_JIGSAW_TOOLS)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(TOOL_GENGRAPHS) --output $(GENGRAPHS_DIR)
 
 $(SPEC_DOTFILES_DIR)/java.se.dot: $(BUILD_JIGSAW_TOOLS)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(TOOL_GENGRAPHS) --spec --output $(SPEC_DOTFILES_DIR)
 
 $(GENGRAPHS_DIR)/technology-summary.html: $(TOOLS_MODULE_SRCDIR)/technology-summary.html
 	$(install-file)
 
 $(GENGRAPHS_DIR)/module-summary.html: $(BUILD_JIGSAW_TOOLS) $(GENGRAPHS_DIR)/technology-summary.html
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(TOOL_MODULESUMMARY) -o $@ --module-path $(IMAGES_OUTPUTDIR)/jmods
 
 all: $(GENGRAPHS_DIR)/jdk.dot $(GENGRAPHS_DIR)/module-summary.html $(SPEC_DOTFILES_DIR)/java.se.dot
--- a/make/GensrcModuleInfo.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/GensrcModuleInfo.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -79,7 +79,7 @@
       $(BUILD_TOOLS_JDK) \
       $(MOD_FILES) \
       $(call DependOnVariable, ALL_MODULES)
-		$(MKDIR) -p $(@D)
+		$(call MakeTargetDir)
 		$(RM) $@ $@.tmp
 		$(TOOL_GENMODULEINFOSOURCE) -o $@.tmp \
 		    --source-file $< \
--- a/make/MacBundles.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/MacBundles.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -63,13 +63,13 @@
 
   $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
 	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	$(LN) -s ../Home/lib/libjli.dylib $@
 
   $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
 	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	$(LN) -s ../Home/lib/libjli.dylib $@
 
--- a/make/autoconf/basics.m4	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/autoconf/basics.m4	Tue Oct 09 14:57:23 2018 -0700
@@ -569,7 +569,8 @@
   BASIC_REQUIRE_PROGS(GZIP, pigz gzip)
   BASIC_REQUIRE_PROGS(LN, ln)
   BASIC_REQUIRE_PROGS(LS, ls)
-  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
+  # gmkdir is known to be safe for concurrent invocations with -p flag.
+  BASIC_REQUIRE_PROGS(MKDIR, [gmkdir mkdir])
   BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
   BASIC_REQUIRE_PROGS(MV, mv)
   BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
--- a/make/common/JarArchive.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/common/JarArchive.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -235,7 +235,7 @@
 
   # Here is the rule that creates/updates the jar file.
   $$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE)
-	$(MKDIR) -p $$($1_BIN)
+	$$(call MakeTargetDir)
 	$$($1_GREP_INCLUDE_OUTPUT)
 	$$($1_GREP_EXCLUDE_OUTPUT)
         # If the vardeps file is part of the newer prereq list, it means that
--- a/make/common/JavaCompilation.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/common/JavaCompilation.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -423,7 +423,7 @@
         $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
 
         $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET)
-		$(MKDIR) -p $$(@D)
+		$$(call MakeTargetDir)
 		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
 		  for f in `$(CD) $$($1_HEADERS).$1.tmp && $(FIND) . -type f`; do \
 		    if [ ! -f "$$($1_HEADERS)/$$$$f" ] \
--- a/make/common/Modules.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/common/Modules.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -321,7 +321,7 @@
 
 $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
     $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
 	    ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \
--- a/make/common/ZipArchive.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/common/ZipArchive.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -124,8 +124,8 @@
   # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
   # and only fail if it's not.
   $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
-	$(MKDIR) -p $$(@D)
-	$(ECHO) Updating $$($1_NAME)
+	$$(call LogWarn, Updating $$($1_NAME))
+	$$(call MakeTargetDir)
 	$$(foreach s,$$($1_SRC),(cd $$s && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . \
 	    $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* \
 	    $$($1_ZIP_EXCLUDES_$$s) \
--- a/make/copy/Copy-java.base.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/copy/Copy-java.base.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -128,7 +128,7 @@
 POLICY_SRC_LIST := $(POLICY_SRC)
 
 $(POLICY_DST): $(POLICY_SRC_LIST)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@ $@.tmp
 	$(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
 	$(MV) $@.tmp $@
@@ -153,7 +153,7 @@
 endif
 
 $(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@ $@.tmp
 	$(foreach f,$(DEF_POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
 	$(MV) $@.tmp $@
--- a/make/gendata/GendataFontConfig.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gendata/GendataFontConfig.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -38,7 +38,7 @@
 $(GENDATA_FONT_CONFIG_DST)/%.bfc: \
     $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties \
     $(BUILD_TOOLS_JDK)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	$(TOOL_COMPILEFONTCONFIG) $< $@
 	$(CHMOD) 444 $@
--- a/make/gendata/GendataHtml32dtd.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gendata/GendataHtml32dtd.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -28,7 +28,7 @@
 HTML32DTD = $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/text/html/parser/html32.bdtd
 $(HTML32DTD): $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating HTML DTD file)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	($(TOOL_DTDBUILDER) html32 > $@) || exit 1
 
--- a/make/gendata/GendataTZDB.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gendata/GendataTZDB.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -35,8 +35,8 @@
 GENDATA_TZDB_DAT := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/tzdb.dat
 
 $(GENDATA_TZDB_DAT): $(TZDATA_TZFILES)
+	$(call MakeTargetDir)
 	$(RM) $(GENDATA_TZDB_DAT)
-	$(MKDIR) -p $(@D)
 	$(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE)
 
 TARGETS += $(GENDATA_TZDB_DAT)
--- a/make/gensrc/GensrcCLDR.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcCLDR.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -50,7 +50,7 @@
     $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \
     $(ZONENAME_TEMPLATE) \
     $(BUILD_TOOLS_JDK)
-	$(MKDIR) -p $(GENSRC_BASEDIR)
+	$(call MakeDir, $(GENSRC_BASEDIR))
 	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
 	    -baselocales $(CLDR_BASE_LOCALES) \
 	    -o $(GENSRC_BASEDIR) \
@@ -62,7 +62,7 @@
     $(wildcard $(CLDRSRCDIR)/main/*.xml) \
     $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \
     $(BUILD_TOOLS_JDK)
-	$(MKDIR) -p $(GENSRC_DIR)
+	$(call MakeDir, $(GENSRC_DIR))
 	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
 	    -baselocales $(CLDR_BASE_LOCALES) \
 	    -o $(GENSRC_DIR)
--- a/make/gensrc/GensrcCharsetCoder.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcCharsetCoder.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -34,8 +34,8 @@
 ################################################################################
 
 $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
-	$(MKDIR) -p $(@D)
-	-$(RM) $@.tmp
+	$(call MakeTargetDir)
+	$(RM) $@.tmp
 	$(TOOL_SPP) < $< >$@.tmp \
 	    -Kdecoder \
 	    -DA='A' \
@@ -69,8 +69,8 @@
 ################################################################################
 
 $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
-	$(MKDIR) -p $(@D)
-	-$(RM) $@.tmp
+	$(call MakeTargetDir)
+	$(RM) $@.tmp
 	$(TOOL_SPP) < $< >$@.tmp \
 	    -Kencoder \
 	    -DA='An' \
--- a/make/gensrc/GensrcCommonLangtools.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcCommonLangtools.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -49,7 +49,7 @@
 #           root.
 define SetupVersionProperties
   $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2):
-	$(MKDIR) -p $$(@D)
+	$$(call MakeTargetDir)
 	$(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \
 	    > $$@
 
@@ -92,7 +92,7 @@
 
   # Now setup the rule for the generation of the resource bundles.
   $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_props: $$(PROPSOURCES)
-	$(MKDIR) -p $$(@D) $$(PROPDIRS)
+	$$(call MakeDir, $$(@D) $$(PROPDIRS))
 	$(FIND) $$(@D) -name "*.java" -a ! -name "*Properties.java" $(FIND_DELETE)
 	$(ECHO) Compiling $$(words $$(PROPSOURCES)) properties into resource bundles for $(MODULE)
 	$(TOOL_COMPILEPROPS_CMD) $$(PROPCMDLINE)
@@ -122,7 +122,7 @@
 
   # Now setup the rule for the generation of the resource bundles.
   $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $$(PARSEPROPSOURCES)
-	$(MKDIR) -p $$(@D) $$(PARSEPROPDIRS)
+	$$(call MakeDir, $$(@D) $$(PARSEPROPDIRS))
 	$(FIND) $$(@D) -name "*Properties.java" $(FIND_DELETE)
 	$(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE)
 	$(TOOL_PARSEPROPS_CMD) $$(PARSEPROPCMDLINE)
--- a/make/gensrc/GensrcLocaleData.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcLocaleData.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -131,7 +131,7 @@
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
     $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
 	    > $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_the.locale_resources
 	$(SED) $(SED_BASEARGS) $< > $@
@@ -139,7 +139,7 @@
 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
     $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
 	    > $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/_the.locale_resources
 	$(SED) $(SED_NONBASEARGS) $< > $@
--- a/make/gensrc/GensrcModuleLoaderMap.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcModuleLoaderMap.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -46,7 +46,7 @@
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \
     $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
     $(VARDEPS_FILE) $(BUILD_TOOLS_JDK)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@ $@.tmp
 	$(TOOL_GENCLASSLOADERMAP) -boot $(BOOT_MODULES_LIST) \
 	     -platform $(PLATFORM_MODULES_LIST) -o $@.tmp $<
--- a/make/gensrc/GensrcProperties.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcProperties.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -34,7 +34,7 @@
       $$(subst _zh_TW,_zh_HK, $2))
 
   $$($1_$2_TARGET): $2
-	$(MKDIR) -p $$(@D)
+	$$(call MakeTargetDir)
 	$(CAT) $$< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $$@
 
   $1 += $$($1_$2_TARGET)
@@ -105,8 +105,8 @@
 
   # Now setup the rule for the generation of the resource bundles.
   $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $(BUILD_TOOLS_JDK)
-	$(MKDIR) -p $$(@D) $$($1_DIRS)
-	$(ECHO) Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE)
+	$$(call LogWarn, Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE))
+	$$(call MakeDir, $$(@D) $$($1_DIRS))
 	$$(eval $$(call ListPathsSafely, $1_CMDLINE, $$($1_CMDLINE_FILE)))
 	$(TOOL_COMPILEPROPERTIES) -quiet @$$($1_CMDLINE_FILE)
 	$(TOUCH) $$@
--- a/make/gensrc/GensrcSwing.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/gensrc/GensrcSwing.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -32,7 +32,7 @@
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating Nimbus source files)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(TOOL_GENERATENIMBUS) $(LOG_DEBUG) \
 	    -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop \
 	    -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus
--- a/make/launcher/Launcher-java.base.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/launcher/Launcher-java.base.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -45,7 +45,7 @@
 ))
 
 $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(RM) $@
 	$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@
 
--- a/make/rmic/Rmic-java.management.rmi.gmk	Tue Oct 09 07:33:15 2018 -0400
+++ b/make/rmic/Rmic-java.management.rmi.gmk	Tue Oct 09 14:57:23 2018 -0700
@@ -51,7 +51,7 @@
 	$(foreach src, $(classfiles), \
 	    $(eval target := $(patsubst $(RMIC_GENSRC_DIR)/%, \
 	        $(STUB_CLASSES_DIR)/%, $(src))) \
-	    $(MKDIR) -p $(dir $(target)) ; \
+	    $(call MakeDir, $(dir $(target))) \
 	    $(MV) $(src) $(target) $(NEWLINE))
 	$(TOUCH) $@