changeset 3146:2eade65eab5b

6995674: (launcher) make of jli fails on windows if directory exists Reviewed-by: darcy, ohair
author ksrini
date Mon, 01 Nov 2010 10:12:48 -0700
parents d26730767789
children e95c7f8979ee
files make/java/jli/Makefile
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/java/jli/Makefile	Mon Nov 01 07:57:46 2010 -0700
+++ b/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)