--- old/make/gendata/Gendata-java.base.gmk	2017-06-08 14:45:11.603064999 +0530
+++ new/make/gendata/Gendata-java.base.gmk	2017-06-08 14:45:10.895064999 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -48,7 +48,7 @@
 
 ################################################################################
 
-GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
+GENDATA_CURDATA := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/currency.data
 
 $(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))