# HG changeset patch
# User nloodin
# Date 1338896619 -7200
# Node ID 1062b2cf73d0649e0ed5b16d92a8d3c168308a59
# Parent  59547faaa927922e50e61c77a05175ee6d79b8b4
7163471: Licensee source bundle failed around 7u4
Reviewed-by: dholmes, sla, brutisso, erikj

diff -r 59547faaa927 -r 1062b2cf73d0 jdk/make/com/oracle/Makefile
--- a/jdk/make/com/oracle/Makefile	Thu Jun 07 12:31:45 2012 +0100
+++ b/jdk/make/com/oracle/Makefile	Tue Jun 05 13:43:39 2012 +0200
@@ -30,6 +30,22 @@
 #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 @@
   endif
 endif
 
-JFR =
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-	JFR = jfr
-endif
-endif
-
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)
 
 include $(BUILDDIR)/common/Subdirs.gmk