# HG changeset patch # User erikj # Date 1356638153 -3600 # Node ID eed28ee0dbd60383ab85147cc952155657e358a9 # Parent d32ad37472e695495293996a4c628e852a736acd 8005548: build-infra: Fix docs target on windows Summary: Fix path sep variable Reviewed-by: tbell diff -r d32ad37472e6 -r eed28ee0dbd6 common/makefiles/javadoc/Javadoc.gmk --- a/common/makefiles/javadoc/Javadoc.gmk Thu Dec 27 20:18:21 2012 +0100 +++ b/common/makefiles/javadoc/Javadoc.gmk Thu Dec 27 20:55:53 2012 +0100 @@ -32,8 +32,6 @@ # Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc. # -CLASSPATH_SEPARATOR = : - DOCSDIR=$(OUTPUT_ROOT)/docs TEMPDIR=$(OUTPUT_ROOT)/docstemp @@ -137,7 +135,7 @@ # List of all possible directories for javadoc to look for sources # NOTE: Quotes are required around sourcepath argument only on Windows. # Otherwise, you get "No packages or classes specified." due -# to $(CLASSPATH_SEPARATOR) being interpreted as an end of +# to $(PATH_SEP) being interpreted as an end of # command (newline or shell ; character) ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \ $(JDK_IMPSRC) \ @@ -154,7 +152,7 @@ EMPTY:= SPACE:= $(EMPTY) $(EMPTY) RELEASEDOCS_SOURCEPATH = \ - $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS))) + $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS))) define prep-target $(MKDIR) -p $(@D)