equal
deleted
inserted
replaced
60 # |
60 # |
61 # Include the exported private packages in ct.sym. |
61 # Include the exported private packages in ct.sym. |
62 # This is an interim solution until the ct.sym is replaced |
62 # This is an interim solution until the ct.sym is replaced |
63 # with a new module system (being discussed for JDK 7). |
63 # with a new module system (being discussed for JDK 7). |
64 # |
64 # |
65 EXPORTED_PRIVATE_PKGS = com.sun.servicetag |
65 EXPORTED_PRIVATE_PKGS = com.sun.servicetag \ |
|
66 com.oracle.net |
66 |
67 |
67 # 64-bit solaris has a few special cases. We define the variable |
68 # 64-bit solaris has a few special cases. We define the variable |
68 # SOLARIS64 for use in this Makefile to easily test those cases |
69 # SOLARIS64 for use in this Makefile to easily test those cases |
69 ifeq ($(PLATFORM), solaris) |
70 ifeq ($(PLATFORM), solaris) |
70 ifeq ($(ARCH_DATA_MODEL), 64) |
71 ifeq ($(ARCH_DATA_MODEL), 64) |
84 # Same files for jdk and jre, no name changes |
85 # Same files for jdk and jre, no name changes |
85 IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
86 IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
86 IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
87 IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
87 else |
88 else |
88 # Where to find these files |
89 # Where to find these files |
89 SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk |
90 ifeq ($(J4B), true) |
90 SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre |
91 SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdkfb |
|
92 SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jrefb |
|
93 else |
|
94 SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk |
|
95 SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre |
|
96 endif |
|
97 |
91 IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt |
98 IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt |
92 IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt |
99 IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt |
93 ifeq ($(PLATFORM), windows) |
100 ifeq ($(PLATFORM), windows) |
94 IMAGE_DOCLIST_JRE += README.txt |
101 IMAGE_DOCLIST_JRE += README.txt |
95 else |
102 else |