From 127a39626bcd6b10bcf9bc2082b194c48dcc3895 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Fri, 31 Jul 2009 20:29:29 +0000
Subject: [PATCH]  * Build the restart-helper program in a makefile rather than
 in osx-bundle.sh  * Update paths to use tools/ instead of scripts/ in
 osx-bundle.sh

Originally committed to SVN as r3337.
---
 aegisub/tools/Makefile.am   | 5 +++++
 aegisub/tools/osx-bundle.sh | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/aegisub/tools/Makefile.am b/aegisub/tools/Makefile.am
index 9bf61ed6d..e58771fc4 100644
--- a/aegisub/tools/Makefile.am
+++ b/aegisub/tools/Makefile.am
@@ -3,6 +3,11 @@ common_respack_CPPFLAGS = @WX_CPPFLAGS@
 common_respack_LDFLAGS = @WX_LIBS@
 common_respack_SOURCES = common-respack.cpp
 
+if BUILD_DARWIN
+bin_PROGRAMS += osx-bundle-restart-helper
+osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c
+endif
+
 EXTRA_DIST = \
 	osx-bundle-restart-helper.c \
 	osx-bundle.sh \
diff --git a/aegisub/tools/osx-bundle.sh b/aegisub/tools/osx-bundle.sh
index 35dae8757..f3cda1c3c 100755
--- a/aegisub/tools/osx-bundle.sh
+++ b/aegisub/tools/osx-bundle.sh
@@ -38,9 +38,9 @@ echo "---- Copying Skel Files ----"
 find ${SKEL_DIR} -type f -not -regex ".*.svn.*"
 cp ${SKEL_DIR}/Contents/Resources/*.icns "${PKG_DIR}/Contents/Resources"
 cp ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.dtd "${PKG_DIR}/Contents/Resources/etc/fonts"
-cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f scripts/osx-bundle.sed > "${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf"
+cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf"
 cp ${SKEL_DIR}/Contents/Resources/etc/fonts/conf.d/*.conf "${PKG_DIR}/Contents/Resources/etc/fonts/conf.d"
-cat ${SKEL_DIR}/Contents/Info.plist |sed -f scripts/osx-bundle.sed > "${PKG_DIR}/Contents/Info.plist"
+cat ${SKEL_DIR}/Contents/Info.plist |sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Info.plist"
 
 
 echo
@@ -98,12 +98,11 @@ else
   cp -v src/.libs/${AEGISUB_BIN} "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
 fi
 
-echo cc -o "${PKG_DIR}/Contents/MacOS/restart-helper scripts/osx-bundle-restart-helper.c"
-${CC} -o "${PKG_DIR}/Contents/MacOS/restart-helper" scripts/osx-bundle-restart-helper.c || exit $?
+cp -v tools/osx-bundle-restart-helper "${PKG_DIR}/Contents/MacOS/restart-helper" || exit $?
 
 echo
 echo "---- Libraries ----"
-python scripts/osx-fix-libs.py "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
+python tools/osx-fix-libs.py "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
 
 echo
 echo "Done Creating \"${PKG_DIR}\""