mozilla-central: changeset 47982:737a08309d9723abaced1c7126e084db97b05a9d

author	Benjamin Smedberg <benjamin@smedbergs.us>
	Tue, 20 Jul 2010 12:30:56 -0400
changeset 47982	737a08309d9723abaced1c7126e084db97b05a9d
parent 47981	91da083f3478865b7de81733141c5a656fa5dd43
child 47983	1a63c61cdc6a40b0fd247c8c7ac112f22a5cf43c
push id	14516
push user	bsmedberg@mozilla.com
push date	Tue, 20 Jul 2010 16:31:33 +0000
treeherder	mozilla-central@737a08309d97 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	557225
milestone	2.0b2pre
first release with	nightly linux32 737a08309d97 / 4.0b2pre / 20100720102432 / files nightly linux64 737a08309d97 / 4.0b2pre / 20100720103116 / files nightly mac 737a08309d97 / 4.0b2pre / 20100720103504 / files nightly win32 737a08309d97 / 4.0b2pre / 20100720114135 / files nightly win64 3cc0b56a0519 / 4.0b2pre / 20100720130658 / files
last release without	nightly linux32 c71dba463f85 / 4.0b2pre / 20100720025957 / files nightly linux64 c71dba463f85 / 4.0b2pre / 20100720030812 / files nightly mac 6b58d2615145 / 4.0b2pre / 20100719030910 / files nightly win32 c71dba463f85 / 4.0b2pre / 20100720041526 / files nightly win64 a80066930eb5 / 4.0b2pre / 20100719084907 / files
releases	nightly linux32 4.0b2pre / 20100720102432 / pushlog to previous nightly linux64 4.0b2pre / 20100720103116 / pushlog to previous nightly mac 4.0b2pre / 20100720103504 / pushlog to previous nightly win32 4.0b2pre / 20100720114135 / pushlog to previous

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -41,27 +41,26 @@
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
-@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+#endif
 #ifdef MOZ_IPC
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #endif
-#endif
 #ifdef WINCE
 @BINPATH@/mozce_shunt.dll
 #elifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll