diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 124a71924..9ee61c036 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -22,10 +22,10 @@ SUBDIRS = \ po osx-bundle: - @SHELL@ scripts/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) + @SHELL@ tools/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) osx-dmg: - @SHELL@ scripts/osx-dmg.sh "@BUNDLE_STRING@" "@DMG_STRING@" + @SHELL@ tools/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/tools/osx-bundle.sh b/aegisub/tools/osx-bundle.sh index 2013df530..bb891b45a 100755 --- a/aegisub/tools/osx-bundle.sh +++ b/aegisub/tools/osx-bundle.sh @@ -40,9 +40,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 @@ -116,12 +116,12 @@ 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 $? +echo cc -o "${PKG_DIR}/Contents/MacOS/restart-helper tools/osx-bundle-restart-helper.c" +${CC} -o "${PKG_DIR}/Contents/MacOS/restart-helper" tools/osx-bundle-restart-helper.c || 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}\""