# HG changeset patch # User ihse # Date 1489047244 -3600 # Node ID 7108a2c2088545f6fbbc876bc1021ef3de640cee # Parent fa73683c2c10c9607dabdedd95a3dd34a6946219 8170884: Clean up post-jlink file copying to the images Reviewed-by: erikj diff -r fa73683c2c10 -r 7108a2c20885 jdk/make/copy/Copy-java.base.gmk --- a/jdk/make/copy/Copy-java.base.gmk Wed Mar 08 18:54:34 2017 -0800 +++ b/jdk/make/copy/Copy-java.base.gmk Thu Mar 09 09:14:04 2017 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -235,8 +235,8 @@ # JDK license and assembly exception files to be packaged in JMOD -JDK_LICENSE ?= $(JDK_TOPDIR)/LICENSE -JDK_NOTICE ?= $(JDK_TOPDIR)/ASSEMBLY_EXCEPTION +JDK_LICENSE ?= $(TOPDIR)/LICENSE +JDK_NOTICE ?= $(TOPDIR)/ASSEMBLY_EXCEPTION $(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \ FILES := $(JDK_LICENSE) $(JDK_NOTICE), \