< prev index next >

make/copy/Copy-java.base.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, 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
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -160,21 +160,21 @@
 
 TARGETS += $(DEF_POLICY_DST)
 
 ################################################################################
 
-# CACERTS_FILE is optionally set in configure to override the default cacerts
-# which is otherwise generated in Gendata-java.base.gmk
+ifeq ($(CACERTS_FILE), )
+  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
+endif
+
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
 
 $(CACERTS_DST): $(CACERTS_FILE)
         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%, %, $@))
         $(call install-file)
 
-ifneq ($(CACERTS_FILE), )
-  TARGETS += $(CACERTS_DST)
-endif
+TARGETS += $(CACERTS_DST)
 
 ################################################################################
 
 $(eval $(call SetupCopyFiles, COPY_NET_PROPERTIES, \
     FILES := $(TOPDIR)/src/java.base/share/conf/net.properties, \
< prev index next >