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.
6995674: (launcher) make of jli fails on windows if directory exists
authorksrini
Mon, 01 Nov 2010 10:12:48 -0700
changeset 7041 07f4ed79094e
parent 7040 659824c2a550
child 7042 56e990297bc5
6995674: (launcher) make of jli fails on windows if directory exists Reviewed-by: darcy, ohair
jdk/make/java/jli/Makefile file | annotate | diff | comparison | revisions 
--- a/jdk/make/java/jli/Makefile	Mon Nov 01 07:57:46 2010 -0700
+++ b/jdk/make/java/jli/Makefile	Mon Nov 01 10:12:48 2010 -0700
@@ -148,14 +148,9 @@
 #
 ifeq ($(PLATFORM), windows)
 
-STATIC_LIBRARY_DIR = $(OBJDIR)/static
-STATIC_LIBRARY_NAME = $(LIBPREFIX)$(LIBRARY).lib
-STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
+STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
 
-$(STATIC_LIBRARY_DIR): $(OBJDIR)
-	@$(MKDIR) $(STATIC_LIBRARY_DIR)
-
-$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
+$(STATIC_LIBRARY): $(FILES_o)
 	@$(prep-target)
 	$(LIBEXE) -nologo -out:$@ $(FILES_o)
jdk-sandbox