Stop packaging command-line Mac tools as a bundle.
Review URL: http://codereview.appspot.com/4894046

git-svn-id: http://skia.googlecode.com/svn/trunk@2113 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/Makefile b/Makefile
index f5fa963..a3ac806 100644
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,8 @@
 	$(MAKE) -C out $@ BUILDTYPE=$(BUILDTYPE)
 endif
 ifneq (,$(findstring Darwin, $(uname)))
+	rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'make clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi
 	xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE)
-	mkdir -p out/$(BUILDTYPE)
-	rm -f out/$(BUILDTYPE)/$@
-	ln -s $(CWD)/xcodebuild/$(BUILDTYPE)/$@.app/Contents/MacOS/$@ out/$(BUILDTYPE)/$@
+	ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE)
 endif