changeset 624:0e38044a6f85

8049389: Move orb.idl and ir.idl to JDK include directory Reviewed-by: erikj
author alanb
date Fri, 26 Sep 2014 22:24:37 +0100
parents cfdac5887952
children 24a0bad5910f
files make/CompileCorba.gmk
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileCorba.gmk	Thu Sep 25 12:40:17 2014 -0700
+++ b/make/CompileCorba.gmk	Fri Sep 26 22:24:37 2014 +0100
@@ -51,13 +51,11 @@
     JAR := $(INTERIM_CORBA_JAR)))
 
 ################################################################################
-# Copy idl files straight to jdk/lib. Not sure if this is the right way to do
-# it, but we are moving away from the one repo at a time build. Perhaps we should
-# scrap the 'jdk' prefix to bin, lib etc?
-$(JDK_OUTPUTDIR)/lib/%: $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
+# Copy idl files straight to jdk/include.
+$(JDK_OUTPUTDIR)/include/%: $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
 	$(install-file)
 
-IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/lib/orb.idl $(JDK_OUTPUTDIR)/lib/ir.idl
+IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/include/orb.idl $(JDK_OUTPUTDIR)/include/ir.idl
 
 ################################################################################