Merge m-c to inbound. a=merge on a CLOSED TREE

--HG--
extra : amend_source : dd2cc4a0415fbc692f8160703e9e4a5c16848ec7
This commit is contained in:
Ryan VanderMeulen 2017-12-07 18:54:17 -05:00
commit 64b62f3fcc

View File

@ -4539,11 +4539,11 @@ MOZ_ARG_WITH_STRING(macbundlename-prefix,
MOZ_MACBUNDLE_NAME=$MOZ_APP_DISPLAYNAME
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX} ${MOZ_MACBUNDLE_NAME}"
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
fi
if test "$MOZ_DEBUG"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME} Debug.app"
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME}Debug.app"
else
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
fi