* 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.
This commit is contained in:
Amar Takhar 2009-01-07 08:48:33 +00:00
parent 302f12b472
commit 6c41f69443
3 changed files with 4 additions and 3 deletions

View file

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

View file

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

View file

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