From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:41:04 +0000 (+0000)
Subject: 2003/11/05 09:26:52
X-Git-Tag: RC3~367
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=f59942ab30a1632789b9d042d233b205245d506b

2003/11/05 09:26:52

darcs-hash:20040130074104-2ba56-507763b538595f190345ea0164f2f251a7c8d8f8.gz
---

diff --git a/Makefile.upstream b/Makefile.upstream
index 670e934..2434fa7 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -120,6 +120,7 @@ endif
 	mkdir -p upstream/$*
 	curl $(url_$*) | tar xzf - -C upstream/$*
 	mv upstream/$*/$* upstream/$*/src; true
+	mv upstream/$*/libmspack upstream/$*/src; true
 	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
@@ -136,10 +137,7 @@ endif
 
 .configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
 	mkdir -p upstream/libmspack-20030726/build-$(target)
-	cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
-	touch $@
-
-.install_libmspack-20030726_$(target): .configure_libmspack-20030726_$(target)
+	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
@@ -155,6 +153,8 @@ endif
 		make $(setcc) $(environment_$*_$(target))
 	touch $@
 
+.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
+
 .install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \