From 6c41f69443edbae9cbbc72c3930e5a0df2a448db Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 7 Jan 2009 08:48:33 +0000
Subject: [PATCH] * AC_SUBST(AEGISUB_VERSION_DATA) configure.in * Add second
 argument to osx-bundle.sh ($AEGISUB_VERSION_DATA) * Modify osx-bundle.sh to
 copy correct binary name.

Originally committed to SVN as r2671.
---
 Makefile.am           | 2 +-
 configure.in          | 2 +-
 scripts/osx-bundle.sh | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0bfd31d4e..83d9f3136 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = \
 	desktop
 
 osx-bundle:
-	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@
+	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@ @AEGISUB_VERSION_DATA@
 
 osx-dmg:
 	@SHELL@ scripts/osx-dmg.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@ "@PACKAGE_TARNAME@ @PACKAGE_VERSION@"
diff --git a/configure.in b/configure.in
index 5d4b61b99..381ed5bef 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ AEGISUB_VERSION=aegisub_version
 AEGISUB_VERSION_DATA=aegisub_version_data
 
 AC_DEFINE_UNQUOTED(AEGISUB_VERSION_DATA, ["$AEGISUB_VERSION_DATA"], [Data path suffix.])
-
+AC_SUBST(AEGISUB_VERSION_DATA)
 
 aegisubdatadir="$datadir/$PACKAGE/aegisub_version_data"
 aegisubdocdir="$datadir/doc/$PACKAGE/aegisub_version_data"
diff --git a/scripts/osx-bundle.sh b/scripts/osx-bundle.sh
index 6e6cb2b9e..7ba2e67e9 100755
--- a/scripts/osx-bundle.sh
+++ b/scripts/osx-bundle.sh
@@ -2,6 +2,7 @@
 
 PKG_DIR=${1}.app
 SKEL_DIR="packages/osx_bundle"
+AEGISUB_VERSION_DATA="${2}"
 
 if ! test -d packages/osx_bundle; then
   echo
@@ -50,7 +51,7 @@ done
 
 echo
 echo "---- Binaries ----"
-cp -v aegisub/.libs/aegisub ${PKG_DIR}/Contents/MacOS
+cp -v aegisub/.libs/aegisub-${AEGISUB_VERSION_DATA} ${PKG_DIR}/Contents/MacOS/aegisub
 
 echo
 echo "---- Libraries ----"