From 2a5666be696bf325937c2e49c90ae10218d7c7c4 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 14 May 2012 13:21:58 +0000
Subject: [PATCH] Pass the path to wx-config to osx-bundle.sh as it may not be
 on the path

Originally committed to SVN as r6780.
---
 aegisub/Makefile            | 4 ++--
 aegisub/Makefile.inc.in     | 1 +
 aegisub/configure.in        | 1 +
 aegisub/tools/osx-bundle.sh | 6 ++----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aegisub/Makefile b/aegisub/Makefile
index 6393bb911..f3b80a6e8 100644
--- a/aegisub/Makefile
+++ b/aegisub/Makefile
@@ -14,13 +14,13 @@ all: ;
 
 ifeq (yes, $(BUILD_DARWIN))
 osx-bundle:
-	$(BIN_SHELL) tools/osx-bundle.sh "$(BUNDLE_STRING)" $(AEGISUB_VERSION_DATA) DICT_DIR=$(DICT_DIR)
+	$(BIN_SHELL) tools/osx-bundle.sh "$(BUNDLE_STRING)" $(AEGISUB_VERSION_DATA) "$(BIN_WX_CONFIG)" DICT_DIR=$(DICT_DIR)
 
 osx-dmg: osx-bundle
 	$(BIN_SHELL) tools/osx-dmg.sh "$(BUNDLE_STRING)" "$(DMG_STRING)"
 
 osx-tinderbox-bundle:
-	$(BIN_SHELL) tools/osx-bundle.sh "$(T_BUNDLE)" $(AEGISUB_VERSION_DATA) DICT_DIR="$(DICT_DIR)"
+	$(BIN_SHELL) tools/osx-bundle.sh "$(T_BUNDLE)" $(AEGISUB_VERSION_DATA) "$(BIN_WX_CONFIG)" DICT_DIR="$(DICT_DIR)"
 
 osx-tinderbox-dmg:
 	$(BIN_SHELL) tools/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)"
diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in
index 86bc60256..197110320 100644
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@@ -154,3 +154,4 @@ BIN_ECHO     = echo
 BIN_TOUCH    = touch
 BIN_TAR      = tar
 BIN_GZIP     = gzip
+BIN_WX_CONFIG = @WX_CONFIG_PATH@
diff --git a/aegisub/configure.in b/aegisub/configure.in
index 50b5a5887..604ba499d 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -489,6 +489,7 @@ WX_STANDARD_OPTIONS([debug])
 WX_DEBUG=$DEBUG
 WX_UNICODE=$UNICODE
 WX_CONFIG_CHECK([wx_required_version],,,[std,gl,stc],[$WXCONFIG_FLAGS])
+AC_SUBST(WX_CONFIG_PATH)
 
 AS_IF([test x$WX_VERSION = x],
   [AC_MSG_FAILURE([wxWidgets detection failed, please set --with-wx* or add the libraries to your LIBS, CXX/CFLAGS.])])
diff --git a/aegisub/tools/osx-bundle.sh b/aegisub/tools/osx-bundle.sh
index aee788822..86e039818 100755
--- a/aegisub/tools/osx-bundle.sh
+++ b/aegisub/tools/osx-bundle.sh
@@ -4,12 +4,10 @@ set -e
 
 PKG_DIR=${1}.app
 SKEL_DIR="packages/osx_bundle"
-AEGISUB_VERSION_DATA="${2}"
-AEGISUB_BIN="aegisub-${AEGISUB_VERSION_DATA}"
+AEGISUB_BIN="aegisub-${2}"
 SRCDIR=`pwd`
 HOME_DIR=`echo ~`
-WX_CONFIG="wx-config"
-WX_PREFIX=`${WX_CONFIG} --prefix`
+WX_PREFIX=`${3} --prefix`
 
 if test -z "${CC}"; then
   CC="cc"