OpenJDK / jdk / jdk10
changeset 26883:72d2793e397a
Merge
| author | lana |
|---|---|
| date | Fri, 03 Oct 2014 12:11:03 -0700 |
| parents | d287b5e8a6c0 91ca50999343 |
| children | dd18c3b2cadf |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/corba/make/CompileCorba.gmk Fri Oct 03 11:07:01 2014 -0700 +++ b/corba/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 ################################################################################