Mercurial > hg > openjdk > jdk7 > jdk

changeset 4186:cb71f8f695f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ohair
date Thu, 12 May 2011 07:28:52 -0700
parents 312612e89ece (current diff) 13fa9a0c628f (diff)
children d2c99ad6ab55
files
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/rmi/rmi/Makefile	Wed May 11 18:52:46 2011 -0700
+++ b/make/sun/rmi/rmi/Makefile	Thu May 12 07:28:52 2011 -0700
@@ -85,16 +85,21 @@
 	sun.rmi.registry.RegistryImpl \
 	sun.rmi.transport.DGCImpl
 
-ifeq ($(PLATFORM), windows)
-build: stubs
-else # PLATFORM
-ifneq ($(ARCH_DATA_MODEL), 32)
-build: stubs
-else # ARCH_DATA_MODEL
-build: stubs bin
+#
+# The java-rmi.cgi script in bin/ only gets delivered in certain situations
+#
+BUILD_TARGETS = stubs
+ifeq ($(PLATFORM), linux)
+  BUILD_TARGETS += bin
 endif
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    BUILD_TARGETS += bin
+  endif
 endif
 
+build: $(BUILD_TARGETS)
+
 clean clobber:: bin.clean