Merge pull request #659 from pshipton/notices

Create distinct openj9-licenses and openj9-notices

closed/make/Images.gmk

@@ -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
@@ -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
@@ -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.