Mercurial > hg > openjdk > jdk9 > corba
changeset 626:24a0bad5910f jdk9-b34
Merge
author | lana |
---|---|
date | Fri, 03 Oct 2014 12:11:03 -0700 |
parents | fa226c18e803 (current diff) 0e38044a6f85 (diff) |
children | 9bc2dbd3dfb8 |
files | |
diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileCorba.gmk Fri Oct 03 11:07:01 2014 -0700 +++ b/make/CompileCorba.gmk Fri Oct 03 12:11:03 2014 -0700 @@ -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 ################################################################################