From 51aeaaf1c1525490f4d70bf6a0af24590bfca085 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 26 Sep 2014 22:24:37 +0100
Subject: [PATCH] 8049389: Move orb.idl and ir.idl to JDK include directory
Reviewed-by: erikj
---
corba/make/CompileCorba.gmk | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/corba/make/CompileCorba.gmk b/corba/make/CompileCorba.gmk
index 9e19f29473f..3a03e800ec5 100644
--- a/corba/make/CompileCorba.gmk
+++ b/corba/make/CompileCorba.gmk
@@ -51,13 +51,11 @@ $(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
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
################################################################################