uniform naming of upstream org.ibex packages

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index f7867d9..4228f4f 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -107,21 +107,23 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
-.download_nestedvm:
-       mkdir -p upstream/nestedvm
-       cd upstream/nestedvm; wget -l 99 -nH -r http://nestedvm.ibex.org/
+.download_org.ibex.nestedvm:
+       mkdir -p upstream/org.ibex.nestedvm
+       cd upstream/org.ibex.nestedvm; wget -l 999 -nH -r http://nestedvm.ibex.org/
+       find upstream/org.ibex.nestedvm -name index.html -exec rm -f {} \;
        touch $@
 
 .build_nestedvm: .vendor .download_nestedvm
-       cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
+       cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install
        touch $@
 
-.install_nestedvm: .build_nestedvm
+.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
        touch $@
 
 .download_org.ibex.crypto:
        mkdir -p upstream/org.ibex.crypto
-       cd upstream/org.ibex.crypto; wget -l 99 -nH -r http://crypto.ibex.org/
+       cd upstream/org.ibex.crypto; wget -l 999 -nH -r http://crypto.ibex.org/
+       find upstream/org.ibex.crypto -name index.html -exec rm -f {} \;
        touch $@
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes