From 1ea359b8ad7eafe689c4d8bc5daf49d5fcf443a0 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Thu, 31 Mar 2011 09:02:18 +0800
Subject: [PATCH] osx: Update bundle.sh to location change

---
 .gitignore         |  6 +++---
 dist/osx/bundle.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2644f02..636c7f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,9 @@ configure
 data/spek.desktop
 data/spek.desktop.in
 depcomp
+dist/osx/Spek.app
+dist/osx/Spek.dmg
+dist/osx/bin
 dist/win/spek.wxs
 install-sh
 intltool-extract.in
@@ -29,9 +32,6 @@ man/spek.1
 missing
 mkinstalldirs
 omf.make
-osx/Spek.app
-osx/Spek.dmg
-osx/bin
 po/*.gmo
 po/.intltool-merge-cache
 po/POTFILES
diff --git a/dist/osx/bundle.sh b/dist/osx/bundle.sh
index 1322202..d92e67a 100755
--- a/dist/osx/bundle.sh
+++ b/dist/osx/bundle.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cd $(dirname $0)/..
+cd $(dirname $0)/../..
 case "$(uname)" in
     Darwin) profile_name=darwin ;;
     *)
@@ -9,14 +9,14 @@ case "$(uname)" in
         ;;
 esac
 
-./autogen.sh --prefix=$(pwd)/osx/bin
+./autogen.sh --prefix=$(pwd)/dist/osx/bin
 gmake
 gmake install
 
-ige-mac-bundler osx/spek.bundle
+ige-mac-bundler dist/osx/spek.bundle
 
 # Make DMG image
-cd osx
+cd dist/osx
 VOLUME_NAME=Spek
 DMG_APP=Spek.app
 DMG_FILE=$VOLUME_NAME.dmg
@@ -66,4 +66,4 @@ if [ ! "x$1" = "x-m" ]; then
 	rm $DMG_FILE.master
 fi
 
-cd ..
+cd ../..