2003/09/26 05:53:18

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 3c75015..4c950ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ compile: .compile
 
 # PHASE 4: gcj-generated headers
 java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
-build/h/edu/stanford/ejalbert/BrowserLauncher.h:; touch $@
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
 build/h/%.h: build/class/%.class
        @echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
        mkdir -p `dirname $@`
@@ -122,8 +122,8 @@ java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.jav
 build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
        @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
        mkdir -p build/$(platform)
-       upstream/install/bin/$(target)-ar rc $@ $?
-       upstream/install/bin/$(target)-ranlib $@
+       upstream/install/$(target)/bin/ar rc $@ $?
+       upstream/install/$(target)/bin/ranlib $@
 
 $(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a 
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"