From cbe6d65df3a8902ec340fed7a03edc77aa06ae85 Mon Sep 17 00:00:00 2001
From: Nils Loodin <nloodin@openjdk.org>
Date: Tue, 5 Jun 2012 13:43:39 +0200
Subject: [PATCH] 7163471: Licensee source bundle failed around 7u4

Reviewed-by: dholmes, sla, brutisso, erikj
---
 jdk/make/com/oracle/Makefile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/jdk/make/com/oracle/Makefile b/jdk/make/com/oracle/Makefile
index a657750b2c1..63718869a4f 100644
--- a/jdk/make/com/oracle/Makefile
+++ b/jdk/make/com/oracle/Makefile
@@ -30,6 +30,22 @@ PRODUCT = oracle
 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
 include $(BUILDDIR)/common/Defs.gmk
 
+JFR_SRCDIRS_EXIST := $(shell \
+  if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
+    echo true; \
+  else \
+    echo false; \
+  fi)
+
+JFR =
+ifndef OPENJDK
+  ifndef JAVASE_EMBEDDED
+    ifeq ($(JFR_SRCDIRS_EXIST), true)
+      JFR = jfr
+    endif
+  endif
+endif
+
 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
 UCRYPTO =
 ifndef OPENJDK
@@ -38,13 +54,6 @@ ifndef OPENJDK
   endif
 endif
 
-JFR =
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-	JFR = jfr
-endif
-endif
-
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)
 
 include $(BUILDDIR)/common/Subdirs.gmk