Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorerikj
Wed, 22 May 2013 15:00:41 +0200
changeset 17508 053ed974a2ae
parent 17506 f44b96992f26 (current diff)
parent 17507 51479b4c6339 (diff)
child 17509 5d9f2771ea92
Merge
--- a/jdk/makefiles/Images.gmk	Wed May 22 13:48:02 2013 +0100
+++ b/jdk/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
jdk-sandbox