8170884: Clean up post-jlink file copying to the images

Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2017-03-09 09:12:20 +01:00
parent 7f65fc26a9
commit 92591d5f32

View File

@ -309,34 +309,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
endif # Windows
################################################################################
# doc files
JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
# Processing license files from source area to image area
# These are modified to have the platform specific EOL chars.
define process-doc-file
$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
$(MKDIR) -p $(@D)
$(RM) $@
LC_ALL=C $(SED) 's/$$//g' $< > $@
$(CHMOD) 444 $@
endef
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
$(process-doc-file)
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
$(process-doc-file)
JRE_TARGETS += $(JRE_DOC_TARGETS)
JDK_TARGETS += $(JDK_DOC_TARGETS)
################################################################################
# src.zip