# HG changeset patch # User ohair # Date 1280791915 25200 # Node ID a2ce0450136cb73571af9a7b646c019876ffd276 # Parent d0474c0566eaea550cea923b6a9766577f9896d5 6971426: jdk/make/docs docs target does not work on windows Reviewed-by: igor, jjg diff -r d0474c0566ea -r a2ce0450136c jdk/make/docs/Makefile --- a/jdk/make/docs/Makefile Mon Aug 02 16:31:26 2010 -0700 +++ b/jdk/make/docs/Makefile Mon Aug 02 16:31:55 2010 -0700 @@ -84,6 +84,11 @@ $(SHARE_SRC)/../solaris/classes \ $(SHARE_SRC)/../windows/classes \ $(SHARE_SRC)/doc/stub + +# List of directories that actually exist +ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS)) + +# List with classpath separator between them EMPTY:= SPACE:= $(EMPTY) $(EMPTY) RELEASEDOCS_SOURCEPATH = \ @@ -240,7 +245,8 @@ # Default target is same as docs target, create core api and all others it can # -all docs: coredocs otherdocs +all: docs +docs: coredocs otherdocs ################################################################# # Production Targets -- USE THESE TARGETS WHEN: @@ -1178,9 +1184,9 @@ # # Get a cache of all the directories -$(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS) +$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS) $(prep-target) - @for cp in $(ALL_SOURCE_DIRS) ; do \ + @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \ $(ECHO) "$(FIND) $${cp} -type f >> $@"; \ $(FIND) $${cp} -type f >> $@; \ done