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

@@ -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)"

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@

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.])])

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"