changeset 7308:95b4878b4890

6992226: Missing windows COMPANY file property settings Reviewed-by: ohair
author ccheung
date Tue, 09 Nov 2010 23:05:33 -0800
parents 3c2ccfd2eaff
children c0a09e5eca8e 0fa5baf68639
files jdk/make/common/Defs.gmk
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/common/Defs.gmk	Thu Nov 18 10:35:46 2010 -0800
+++ b/jdk/make/common/Defs.gmk	Tue Nov 09 23:05:33 2010 -0800
@@ -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