From bf8bdc9b451be5541aa63eb43e16eed1f34eb5db Mon Sep 17 00:00:00 2001
From: brian <brian@brianweb.net>
Date: Sun, 27 Jun 2004 23:35:52 -0700
Subject: [PATCH] sanity checks before extraction fix

darcs-hash:20040628063552-24bed-1a9e77219125e22bdb039cee21904ca6e7a59ff1.gz
---
 upstream/Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/upstream/Makefile b/upstream/Makefile
index 89cdbce..4ba354d 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -59,7 +59,7 @@ tasks/download_%:
 	touch $@
 
 tasks/extract_%: tasks/download_%
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build
 	cd build && \
 		gzip -dc  ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
@@ -68,7 +68,7 @@ tasks/extract_%: tasks/download_%
 	touch $@
 
 tasks/extract_darcs_%:
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build
 	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
 	if [ -d "$(root)/_darcs" ]; then \
@@ -128,7 +128,7 @@ tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/downloa
 	touch $@
 
 tasks/extract_gcc: tasks/download_gcc
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build
 	cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf -
 	cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | $(TAR) -xf -
@@ -136,7 +136,7 @@ tasks/extract_gcc: tasks/download_gcc
 	touch $@
 
 tasks/patch_%: tasks/extract_%
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	cd build/$*-$(version_$*) &&  \
 	for p in $(patches_$*) end; do \
 		[ "$$p" = "end" ] || $(PATCH) -p0 < ../../patches/$$p || exit 1; \
@@ -160,7 +160,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	touch $@
 
 tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build/gpc.extract
 	cd build/gpc.extract && \
 		gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \
-- 
1.7.10.4