changeset 7172:169451cf0cc5 jdk8-b91

Merge
author erikj
date Wed, 22 May 2013 15:00:41 +0200
parents f559fadbf491 88d6a20672ac
children fbd926b20201 0cec8dc2bcf8 73d3bed5f8c8 60a2184a71f2
files
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/Images.gmk	Wed May 22 13:48:02 2013 +0100
+++ b/makefiles/Images.gmk	Wed May 22 15:00:41 2013 +0200
@@ -352,11 +352,8 @@
         JDK_MAN_PAGES += jvisualvm.1
     endif
 
-    ifndef OPENJDK
-        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src/closed
-    else
-        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src
-    endif
+    # This variable is potentially overridden in the closed makefile.
+    MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
 
     ifeq ($(OPENJDK_TARGET_OS), linux)
         MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc