X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=c375b30fbebf91876d175f19f08d4e9c5f4479ad;hp=37d42b5587e6765a0d96ea79665ca835a23c772a;hb=f4a70cc5b4dc1a175ba741a4eac3a52985b1b322;hpb=3175eeed074a015d5621de59c0fa877d4efe5112

diff --git a/upstream/Makefile b/upstream/Makefile
index 37d42b5..c375b30 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -70,15 +70,24 @@ tasks/extract_%: tasks/download_%
 tasks/extract_darcs_%:
 	mkdir -p build
 	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
-	cd build && darcs get --verbose "$(darcs_$*)"
+	if [ -d "$(root)/_darcs" ]; then \
+		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
+	else \
+		mkdir -p "build/$*" && cd "build/$*"; \
+		wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	touch $@
 
 update_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && darcs pull
+	if [ -d "build/$*/_darcs" ]; then \
+		cd "build/$*" && darcs pull; \
+	else \
+		cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	rm "tasks/build_darcs_$*" # to force a rebuild
 
 tasks/build_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && make
+	cd "build/$*" && $(MAKE)
 	touch $@
 
 tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib