From e247dec1f3415f31e3b65382a0f307969b5ac9ae Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 21 Jan 2010 00:34:45 +0000
Subject: [PATCH] Merge r4010,r4013,r4014 (configure and bundle/dmg generation
 fixes.)

Originally committed to SVN as r4024.
---
 aegisub/Makefile.am  |  5 ++---
 aegisub/configure.in | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 027ad0c89..71a103500 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -25,11 +25,10 @@ SUBDIRS = \
 	po
 
 osx-bundle:
-	@SHELL@ tools/osx-bundle.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR)
-
+	@SHELL@ scripts/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR)
 
 osx-dmg:
-	@SHELL@ tools/osx-dmg.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)"
+	@SHELL@ scripts/osx-dmg.sh "@BUNDLE_STRING@" "@DMG_STRING@"
 
 osx-tinderbox-bundle:
 	@SHELL@ tools/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)"
diff --git a/aegisub/configure.in b/aegisub/configure.in
index 1fcd6a6a6..ade661c3d 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -77,10 +77,12 @@ esac
 case "$target_or_host" in
   ppc-*-* | powerpc-*)
     arch_ppc="yes"
+    arch_bundle="ppc"
   ;;
 
   i*86-*-*)
     arch_x86="yes"
+    arch_bundle="intel"
   ;;
 
   x86_64-*-*)
@@ -228,13 +230,15 @@ AC_DEFINE_UNQUOTED([BUILD_SVN_REVISION], [$SVN_REVISION], [SVN Revision number,
 # Release information.
 if test "aegisub_FINAL_RELEASE" = "1"; then
   AC_DEFINE([FINAL_RELEASE], [aegisub_FINAL_RELEASE], [This is only set to 1 for a RELEASE VERSION.])
-  PACKAGE_STRING="${PACKAGE_STRING}"
-  PACKAGE_VERSION="${PACKAGE_VERSION}"
-  VERSION="${VERSION}"
+  BUNDLE_STRING="Aegisub"
+  DMG_STRING="Aegisub-${PACKAGE_VERSION}-${arch_bundle}"
 else
-  PACKAGE_STRING="${PACKAGE_STRING}-dev-r$SVN_REVISION"
-  PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r$SVN_REVISION"
-  VERSION="${VERSION}-dev-r$SVN_REVISION"
+  PACKAGE_STRING="${PACKAGE_STRING}-dev-r${SVN_REVISION}"
+  PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r${SVN_REVISION}"
+  VERSION="${VERSION}-dev-r${SVN_REVISION}"
+
+  BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}"
+  DMG_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}-${arch_bundle}"
 fi
 
 
@@ -245,6 +249,8 @@ AC_MSG_RESULT($BUILD_DATE)
 
 AC_SUBST(SVN_REVISION)
 AC_SUBST(BUILD_DATE)
+AC_SUBST(BUNDLE_STRING)
+AC_SUBST(DMG_STRING)