X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=2434fa76c2a8402961b50e9b3acf660b4ca1a889;hb=34bb35ae95b7612c75550722133bd3c95574c161;hp=111ee5191d80650f4d445f9583e21ffcbb82ca6b;hpb=4963611978625d087561f5a669a0ba93a04bd1ba;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 111ee51..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): .build_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); \