Mercurial > hg > release > icedtea7-forest-2.4 > jdk

changeset 4358:d2c99ad6ab55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ohair
date Thu, 12 May 2011 17:56:36 -0700
parents 2e430b88b949 (current diff) cb71f8f695f5 (diff)
children 1be8850c7005
files
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/rmi/rmi/Makefile	Thu May 12 17:17:36 2011 -0700
+++ b/make/sun/rmi/rmi/Makefile	Thu May 12 17:56:36 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