commit 4fd5dcc367ecf54b4ef2e2ca7358b6e44b7c5e23
author Calvin Cheung <ccheung@openjdk.org> Tue Nov 09 23:05:33 2010 -0800
committer Calvin Cheung <ccheung@openjdk.org> Tue Nov 09 23:05:33 2010 -0800
tree 1a1f51f6f585cbd4c1205c006bfa3962439ee511
parent 7f63405e59650026c5c82b65b9d6a6748c33efe6

6992226: Missing windows COMPANY file property settings

Reviewed-by: ohair

jdk/make/common/Defs.gmk

diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index 31e3a4a..71ab366 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -83,14 +83,19 @@
   CLOSED_SRC  = $(BUILDDIR)/../src/closed
 endif
 
-# If we have no closed directory, force it to an openjdk build
-CLOSED_SRC_DIR_EXISTS := $(shell \
-  if [ -d $(CLOSED_SRC) ] ; then \
-    echo true; \
-  else \
-    echo false; \
-  fi)
-ifeq ($(CLOSED_SRC_DIR_EXISTS), false)
+# If CLOSE_SRC_INCLUDED isn't set to true, check if there's any
+# closed directory.
+ifneq ($(CLOSED_SRC_INCLUDED), true)
+  CLOSED_SRC_INCLUDED := $(shell \
+    if [ -d $(CLOSED_SRC) ] ; then \
+      echo true; \
+    else \
+      echo false; \
+    fi)
+endif
+
+# Set OPENJDK based on CLOSED_SRC_INCLUDED
+ifeq ($(CLOSED_SRC_INCLUDED), false)
   OPENJDK = true
 endif