Skip to content

Commit

Permalink
Create distinct openj9-licenses and openj9-notices
Browse files Browse the repository at this point in the history
Issue eclipse-openj9/openj9#17164

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
  • Loading branch information
pshipton committed Apr 14, 2023
1 parent 5173edd commit 2f94c87
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions closed/make/Images.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2018, 2021 All Rights Reserved
# (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand Down Expand Up @@ -42,7 +42,10 @@ endif # OPENJ9_ENABLE_DDR
$(addsuffix /LICENSE, $(JDK_IMAGE_DIR) $(JDK_IMAGE_DIR)/jre $(JRE_IMAGE_DIR)) : $(SRC_ROOT)/LICENSE
$(process-doc-file)

$(addsuffix /openj9-notices, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(OPENJ9_TOPDIR)/LICENSE
$(addsuffix /openj9-licenses, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(OPENJ9_TOPDIR)/LICENSE
$(call install-file)

$(addsuffix /openj9-notices, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(OPENJ9_TOPDIR)/NOTICES.md
$(call install-file)

$(addsuffix /epl-2.0.html, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(OPENJ9_TOPDIR)/epl-2.0.html
Expand All @@ -51,8 +54,8 @@ $(addsuffix /epl-2.0.html, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(OPENJ9_TOPDIR)
$(addsuffix /openj9-openjdk-notices, $(JDK_IMAGE_DIR) $(JRE_IMAGE_DIR)) : $(SRC_ROOT)/openj9-openjdk-notices
$(call install-file)

JDK_DOC_TARGETS += $(addprefix $(JDK_IMAGE_DIR)/, openj9-notices epl-2.0.html openj9-openjdk-notices)
JRE_DOC_TARGETS += $(addprefix $(JRE_IMAGE_DIR)/, openj9-notices epl-2.0.html openj9-openjdk-notices)
JDK_DOC_TARGETS += $(addprefix $(JDK_IMAGE_DIR)/, openj9-licenses openj9-notices epl-2.0.html openj9-openjdk-notices)
JRE_DOC_TARGETS += $(addprefix $(JRE_IMAGE_DIR)/, openj9-licenses openj9-notices epl-2.0.html openj9-openjdk-notices)

# Omit man pages for launchers not provided by OpenJ9 or that describe
# behavior that differs from the OpenJ9 implementation.
Expand Down

0 comments on commit 2f94c87

Please sign in to comment.