Bug 1072652 - Update removed-files for the move from Contents/MacOS to Contents/Resources. r=Standard8. a=Standard8.
authorJosiah Bruner <josiah@programmer.net>
Thu, 16 Oct 2014 09:15:20 -0400
changeset 25494 5da48515537c43099ce571b876a9961b68c4ec50
parent 25493 6e7d4fce8a590adfca6d9368df430be9a1bd8f20
child 25495 cab722bcb4abdcff3217a6d30e599367560531d8
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, Standard8
bugs1072652
Bug 1072652 - Update removed-files for the move from Contents/MacOS to Contents/Resources. r=Standard8. a=Standard8.
mail/installer/removed-files.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -1,293 +1,305 @@
+# Due to Apple Mac OS X packaging requirements files that are in the same
+# directory on other platforms must be located in different directories on
+# Mac OS X. The following defines allow specifying the Mac OS X bundle
+# location which also work on other platforms.
+#
+# @DIR_MACOS@
+# Equals Contents/MacOS/ on Mac OX X and is an empty string on other platforms.
+#
+# @DIR_RESOURCES@
+# Equals Contents/Resources/ on Mac OX X and is an empty string on other
+# platforms.
+
 #ifdef XP_UNIX
   #ifndef XP_MACOSX
     #define UNIX_BUT_NOT_MAC
   #endif
 #endif
 
 # ****************************************************************************
 # * Generic removals section: this is almost certainly where you want to add *
 # * anything that isn't a connected chunk of files with related and shared   *
 # * ifdef conditions.                                                        *
 # ****************************************************************************
-chrome/app-chrome.manifest
-chrome/chrome.rdf
-chrome/en-US-mail.jar
+@DIR_MACOS@chrome/app-chrome.manifest
+@DIR_MACOS@chrome/chrome.rdf
+@DIR_MACOS@chrome/en-US-mail.jar
 #ifdef XP_WIN
   chrome/en-win.jar
 #endif
-chrome/installed-chrome.txt
-chrome/mail.jar
-chrome/offline.jar
-chrome/offline.manifest
-chrome/overlayinfo/
-chrome/qute.jar
-chrome/US.jar
+@DIR_MACOS@chrome/installed-chrome.txt
+@DIR_MACOS@chrome/mail.jar
+@DIR_MACOS@chrome/offline.jar
+@DIR_MACOS@chrome/offline.manifest
+@DIR_MACOS@chrome/overlayinfo/
+@DIR_MACOS@chrome/qute.jar
+@DIR_MACOS@chrome/US.jar
 #ifdef MOZ_WIDGET_GTK2
   chrome/icons/default/abcardWindow.xpm
   chrome/icons/default/abcardWindow16.xpm
   chrome/icons/default/addressbookWindow.xpm
   chrome/icons/default/addressbookWindow16.xpm
   chrome/icons/default/default.xpm
   chrome/icons/default/messengerWindow.xpm
   chrome/icons/default/messengerWindow16.xpm
   chrome/icons/default/msgcomposeWindow.xpm
   chrome/icons/default/msgcomposeWindow16.xpm
 #endif
 #ifdef XP_MACOSX
   #ifndef ACCESSIBILITY
-    components/accessibility.xpt
+    @DIR_MACOS@components/accessibility.xpt
   #endif
 #endif
-components/accessibility-atk.xpt
-components/airbag.xpt
+@DIR_MACOS@components/accessibility-atk.xpt
+@DIR_MACOS@components/airbag.xpt
 #ifdef XP_MACOSX
-  components/libalerts.dylib
-  components/libalerts_s.dylib
+  @DIR_MACOS@components/libalerts.dylib
+  @DIR_MACOS@components/libalerts_s.dylib
 #endif
-components/bookmarks.xpt
-components/chardet.xpt
-components/downloadmanager.xpt
-components/compreg.dat
-components/components.list
-components/dom_loadsave.xpt
-components/history.xpt
-components/jsconsole.xpt
-components/layout.xpt
-components/mailnews.xpt
-components/mozgnome.xpt
-components/@DLL_PREFIX@myspell@DLL_SUFFIX@
-components/necko_data.xpt
-components/aboutRights.js
-components/nsAddonRepository.js
-components/nsBackgroundUpdateService.js
-components/nsCloseAllWindows.js
-components/nsComposerCmdLineHandler.js
-components/nsDownloadProgressListener.js
-components/nsDropbox.js
-components/nsExtensionManager.js
-components/nsInterfaceInfoToIDL.js
-components/nsLDAPPrefsService.js
+@DIR_MACOS@components/bookmarks.xpt
+@DIR_MACOS@components/chardet.xpt
+@DIR_MACOS@components/downloadmanager.xpt
+@DIR_MACOS@components/compreg.dat
+@DIR_MACOS@components/components.list
+@DIR_MACOS@components/dom_loadsave.xpt
+@DIR_MACOS@components/history.xpt
+@DIR_MACOS@components/jsconsole.xpt
+@DIR_MACOS@components/layout.xpt
+@DIR_MACOS@components/mailnews.xpt
+@DIR_MACOS@components/mozgnome.xpt
+@DIR_MACOS@components/@DLL_PREFIX@myspell@DLL_SUFFIX@
+@DIR_MACOS@components/necko_data.xpt
+@DIR_MACOS@components/aboutRights.js
+@DIR_MACOS@components/nsAddonRepository.js
+@DIR_MACOS@components/nsBackgroundUpdateService.js
+@DIR_MACOS@components/nsCloseAllWindows.js
+@DIR_MACOS@components/nsComposerCmdLineHandler.js
+@DIR_MACOS@components/nsDownloadProgressListener.js
+@DIR_MACOS@components/nsDropbox.js
+@DIR_MACOS@components/nsExtensionManager.js
+@DIR_MACOS@components/nsInterfaceInfoToIDL.js
+@DIR_MACOS@components/nsLDAPPrefsService.js
 #ifdef XP_WIN
   components/nsPostUpdateWin.js
 #endif
-components/nsProgressDialog.js
-components/nsProxyAutoConfig.js
-components/nsProxyAutoConfig.manifest
-components/nsScriptableIO.js
+@DIR_MACOS@components/nsProgressDialog.js
+@DIR_MACOS@components/nsProxyAutoConfig.js
+@DIR_MACOS@components/nsProxyAutoConfig.manifest
+@DIR_MACOS@components/nsScriptableIO.js
 #ifdef XP_MACOSX
-  components/nsSpotlightIntegration.js
+  @DIR_MACOS@components/nsSpotlightIntegration.js
 #endif
-components/nsUnsetDefaultMail.js
+@DIR_MACOS@components/nsUnsetDefaultMail.js
 #ifndef MOZ_UPDATER
-  components/nsUpdateService.js
-  components/nsUpdateServiceStub.js
+  @DIR_MACOS@components/nsUpdateService.js
+  @DIR_MACOS@components/nsUpdateServiceStub.js
 #endif
-components/nsUrlClassifierTable.js
+@DIR_MACOS@components/nsUrlClassifierTable.js
 #ifdef XP_WIN
   components/nsWinSearchIntegration.js
 #endif
-components/pluginGlue.js
-components/progressDlg.xpt
-components/sidebar.xpt
-components/signonviewer.xpt
-components/thunderbird.xpt
-components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
-components/spellchk.dll
-components/uconvd.dll
-components/@DLL_PREFIX@wallet@DLL_SUFFIX@
-components/wallet.xpt
-components/walleteditor.xpt
-components/walletpreview.xpt
-components/@DLL_PREFIX@walletviewers@DLL_SUFFIX@
+@DIR_MACOS@components/pluginGlue.js
+@DIR_MACOS@components/progressDlg.xpt
+@DIR_MACOS@components/sidebar.xpt
+@DIR_MACOS@components/signonviewer.xpt
+@DIR_MACOS@components/thunderbird.xpt
+@DIR_MACOS@components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
+@DIR_MACOS@components/spellchk.dll
+@DIR_MACOS@components/uconvd.dll
+@DIR_MACOS@components/@DLL_PREFIX@wallet@DLL_SUFFIX@
+@DIR_MACOS@components/wallet.xpt
+@DIR_MACOS@components/walleteditor.xpt
+@DIR_MACOS@components/walletpreview.xpt
+@DIR_MACOS@components/@DLL_PREFIX@walletviewers@DLL_SUFFIX@
 #ifndef MOZ_WEBSERVICES
-  components/websrvcs.xpt
+  @DIR_MACOS@components/websrvcs.xpt
 #endif
 #ifdef XP_MACOSX
-  components/widget_mac.xpt
+  @DIR_MACOS@components/widget_mac.xpt
 #endif
-components/@DLL_PREFIX@xpcom_compat_c@DLL_SUFFIX@
-components/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
-components/xpcom_obsolete.xpt
-components/xpinstall.xpt
-components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
-components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
-components/xpti.dat
-components/xptitemp.dat
-components/myspell/en-US.dic
-components/myspell/en-US.aff
-components/myspell/
-D3DCompiler_42.dll
-d3dx9_42.dll
-d3dx9_43.dll
-defaults/isp/dotmac.rdf
-defaults/isp/movemail.rdf
-defaults/isp/rss.rdf
-defaults/isp/en-US/dotmac.rdf
-defaults/isp/en-US/movemail.rdf
-defaults/isp/en-US/rss.rdf
-defaults/isp/en-US/
-defaults/isp/US/movemail.rdf
-defaults/isp/US/rss.rdf
-defaults/isp/US/
-defaults/isp/
-defaults/messenger/SpamAssassin.sfd
-defaults/messenger/SpamPal.sfd
-defaults/messenger/en-US/mailViews.dat
-defaults/messenger/US/mailViews.dat
-defaults/pref/all.js
-defaults/pref/editor.js
-defaults/pref/inspector.js
-defaults/pref/non-shared.txt
-defaults/pref/security-prefs.js
-defaults/pref/thunderbird.js
-defaults/pref/winpref.js
-defaults/pref/xpinstall.js
-defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
-defaults/profile/extensions/Extensions.rdf
-defaults/profile/extensions/installed-extensions.txt
-defaults/profile/extensions/
-defaults/profile/US/localstore.rdf
-defaults/profile/US/mimeTypes.rdf
-defaults/profile/US/
+@DIR_MACOS@components/@DLL_PREFIX@xpcom_compat_c@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
+@DIR_MACOS@components/xpcom_obsolete.xpt
+@DIR_MACOS@components/xpinstall.xpt
+@DIR_MACOS@components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
+@DIR_MACOS@components/xpti.dat
+@DIR_MACOS@components/xptitemp.dat
+@DIR_MACOS@components/myspell/en-US.dic
+@DIR_MACOS@components/myspell/en-US.aff
+@DIR_MACOS@components/myspell/
+@DIR_MACOS@D3DCompiler_42.dll
+@DIR_MACOS@d3dx9_42.dll
+@DIR_MACOS@d3dx9_43.dll
+@DIR_MACOS@defaults/isp/dotmac.rdf
+@DIR_MACOS@defaults/isp/movemail.rdf
+@DIR_MACOS@defaults/isp/rss.rdf
+@DIR_MACOS@defaults/isp/en-US/dotmac.rdf
+@DIR_MACOS@defaults/isp/en-US/movemail.rdf
+@DIR_MACOS@defaults/isp/en-US/rss.rdf
+@DIR_MACOS@defaults/isp/en-US/
+@DIR_MACOS@defaults/isp/US/movemail.rdf
+@DIR_MACOS@defaults/isp/US/rss.rdf
+@DIR_MACOS@defaults/isp/US/
+@DIR_MACOS@defaults/isp/
+@DIR_MACOS@defaults/messenger/SpamAssassin.sfd
+@DIR_MACOS@defaults/messenger/SpamPal.sfd
+@DIR_MACOS@defaults/messenger/en-US/mailViews.dat
+@DIR_MACOS@defaults/messenger/US/mailViews.dat
+@DIR_MACOS@defaults/pref/all.js
+@DIR_MACOS@defaults/pref/editor.js
+@DIR_MACOS@defaults/pref/inspector.js
+@DIR_MACOS@defaults/pref/non-shared.txt
+@DIR_MACOS@defaults/pref/security-prefs.js
+@DIR_MACOS@defaults/pref/thunderbird.js
+@DIR_MACOS@defaults/pref/winpref.js
+@DIR_MACOS@defaults/pref/xpinstall.js
+@DIR_MACOS@defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@DIR_MACOS@defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
+@DIR_MACOS@defaults/profile/extensions/Extensions.rdf
+@DIR_MACOS@defaults/profile/extensions/installed-extensions.txt
+@DIR_MACOS@defaults/profile/extensions/
+@DIR_MACOS@defaults/profile/US/localstore.rdf
+@DIR_MACOS@defaults/profile/US/mimeTypes.rdf
+@DIR_MACOS@defaults/profile/US/
 #ifdef XP_WIN
   defaults/shortcuts/Mozilla Thunderbird.lnk
   defaults/shortcuts/Mozilla Thunderbird (No Extensions).lnk
   defaults/shortcuts/
 #endif
-defaults/wallet/VcardSchema.tbl
-defaults/wallet/FieldSchema.tbl
-defaults/wallet/SchemaConcat.tbl
-defaults/wallet/DistinguishedSchema.tbl
-defaults/wallet/SchemaStrings.tbl
-defaults/wallet/PositionalSchema.tbl
-defaults/wallet/StateSchema.tbl
+@DIR_MACOS@defaults/wallet/VcardSchema.tbl
+@DIR_MACOS@defaults/wallet/FieldSchema.tbl
+@DIR_MACOS@defaults/wallet/SchemaConcat.tbl
+@DIR_MACOS@defaults/wallet/DistinguishedSchema.tbl
+@DIR_MACOS@defaults/wallet/SchemaStrings.tbl
+@DIR_MACOS@defaults/wallet/PositionalSchema.tbl
+@DIR_MACOS@defaults/wallet/StateSchema.tbl
 #ifdef MOZ_FOLD_LIBS
-@DLL_PREFIX@nspr4@DLL_SUFFIX@
-@DLL_PREFIX@plds4@DLL_SUFFIX@
-@DLL_PREFIX@plc4@DLL_SUFFIX@
-@DLL_PREFIX@ssl3@DLL_SUFFIX@
-@DLL_PREFIX@smime3@DLL_SUFFIX@
-@DLL_PREFIX@nssutil3@DLL_SUFFIX@
-@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@nspr4@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@plds4@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@plc4@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@ssl3@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@smime3@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@nssutil3@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 
 # Remove obsolete bundled thunderbird test pilot.
 # In the average case, this directory is only used by Test Pilot, and will get
 # removed by the updater. In some cases (eg, partner builds), distribution/
 # will have other files and/or directories in it. In these cases, the updater
 # will print a non-fatal error and continue on, because we're not appending
 # '*' to force a recursive removal.
-distribution/
-distribution/extensions/
-distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
+@DIR_MACOS@distribution/
+@DIR_MACOS@distribution/extensions/
+@DIR_MACOS@distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
 
-greprefs/all.js
-greprefs/security-prefs.js
-greprefs/xpinstall.js
-greprefs/
-hyphenation/
-hyphenation/hyph_af.dic
-hyphenation/hyph_bg.dic
-hyphenation/hyph_ca.dic
-hyphenation/hyph_cy.dic
-hyphenation/hyph_da.dic
-hyphenation/hyph_de-1901.dic
-hyphenation/hyph_de-1996.dic
-hyphenation/hyph_de-CH.dic
-hyphenation/hyph_en_US.dic
-hyphenation/hyph_eo.dic
-hyphenation/hyph_es.dic
-hyphenation/hyph_et.dic
-hyphenation/hyph_fi.dic
-hyphenation/hyph_fr.dic
-hyphenation/hyph_gl.dic
-hyphenation/hyph_hr.dic
-hyphenation/hyph_hsb.dic
-hyphenation/hyph_hu.dic
-hyphenation/hyph_ia.dic
-hyphenation/hyph_is.dic
-hyphenation/hyph_it.dic
-hyphenation/hyph_kmr.dic
-hyphenation/hyph_la.dic
-hyphenation/hyph_lt.dic
-hyphenation/hyph_mn.dic
-hyphenation/hyph_nb.dic
-hyphenation/hyph_nl.dic
-hyphenation/hyph_nn.dic
-hyphenation/hyph_pt.dic
-hyphenation/hyph_ru.dic
-hyphenation/hyph_sh.dic
-hyphenation/hyph_sl.dic
-hyphenation/hyph_sv.dic
-hyphenation/hyph_tr.dic
-hyphenation/hyph_uk.dic
+@DIR_MACOS@greprefs/all.js
+@DIR_MACOS@greprefs/security-prefs.js
+@DIR_MACOS@greprefs/xpinstall.js
+@DIR_MACOS@greprefs/
+@DIR_MACOS@hyphenation/
+@DIR_MACOS@hyphenation/hyph_af.dic
+@DIR_MACOS@hyphenation/hyph_bg.dic
+@DIR_MACOS@hyphenation/hyph_ca.dic
+@DIR_MACOS@hyphenation/hyph_cy.dic
+@DIR_MACOS@hyphenation/hyph_da.dic
+@DIR_MACOS@hyphenation/hyph_de-1901.dic
+@DIR_MACOS@hyphenation/hyph_de-1996.dic
+@DIR_MACOS@hyphenation/hyph_de-CH.dic
+@DIR_MACOS@hyphenation/hyph_en_US.dic
+@DIR_MACOS@hyphenation/hyph_eo.dic
+@DIR_MACOS@hyphenation/hyph_es.dic
+@DIR_MACOS@hyphenation/hyph_et.dic
+@DIR_MACOS@hyphenation/hyph_fi.dic
+@DIR_MACOS@hyphenation/hyph_fr.dic
+@DIR_MACOS@hyphenation/hyph_gl.dic
+@DIR_MACOS@hyphenation/hyph_hr.dic
+@DIR_MACOS@hyphenation/hyph_hsb.dic
+@DIR_MACOS@hyphenation/hyph_hu.dic
+@DIR_MACOS@hyphenation/hyph_ia.dic
+@DIR_MACOS@hyphenation/hyph_is.dic
+@DIR_MACOS@hyphenation/hyph_it.dic
+@DIR_MACOS@hyphenation/hyph_kmr.dic
+@DIR_MACOS@hyphenation/hyph_la.dic
+@DIR_MACOS@hyphenation/hyph_lt.dic
+@DIR_MACOS@hyphenation/hyph_mn.dic
+@DIR_MACOS@hyphenation/hyph_nb.dic
+@DIR_MACOS@hyphenation/hyph_nl.dic
+@DIR_MACOS@hyphenation/hyph_nn.dic
+@DIR_MACOS@hyphenation/hyph_pt.dic
+@DIR_MACOS@hyphenation/hyph_ru.dic
+@DIR_MACOS@hyphenation/hyph_sh.dic
+@DIR_MACOS@hyphenation/hyph_sl.dic
+@DIR_MACOS@hyphenation/hyph_sv.dic
+@DIR_MACOS@hyphenation/hyph_tr.dic
+@DIR_MACOS@hyphenation/hyph_uk.dic
 
 #ifdef MOZ_WIDGET_GTK2
   icons/mozicon128.png
   icons/mozicon16.xpm
   icons/mozicon50.xpm
 #endif
-init.d/README
+@DIR_MACOS@init.d/README
 #ifdef XP_MACOSX
-  isp/dotmac.rdf
+  @DIR_MACOS@isp/dotmac.rdf
 #endif
-isp/gmail.rdf
-isp/af/gmail.rdf
-isp/be/gmail.rdf
-isp/bg/gmail.rdf
-isp/ca/gmail.rdf
-isp/cs/gmail.rdf
-isp/da/gmail.rdf
-isp/de/googlemail.rdf
-isp/el/gmail.rdf
-isp/en-US/gmail.rdf
-isp/en-GB/googlemail.rdf
-isp/es-ES/gmail.rdf
-isp/es-AR/gmail.rdf
-isp/eu/gmail.rdf
-isp/fi/gmail.rdf
-isp/fr/gmail.rdf
-isp/fy-NL/gmail.rdf
-isp/ga-IE/gmail.rdf
-isp/gu-IN/gmail.rdf
-isp/he/gmail.rdf
-isp/hu/gmail.rdf
-isp/it/gmail.rdf
-isp/ja/gmail.rdf
-isp/ja-JP/gmail.rdf
-isp/ka/gmail.rdf
-isp/ko/gmail.rdf
-isp/lt/gmail.rdf
-isp/mk/gmail.rdf
-isp/mn/gmail.rdf
-isp/nb-NO/gmail.rdf
-isp/ne-NP/gmail.rdf
-isp/nl/gmail.rdf
-isp/nn-NO/gmail.rdf
-isp/pa-IN/gmail.rdf
-isp/pl/gmail.rdf
-isp/pt-BR/gmail.rdf
-isp/pt-PT/gmail.rdf
-isp/ro/gmail.rdf
-isp/ru/gmail.rdf
-isp/sk/gmail.rdf
-isp/sl/gmail.rdf
-isp/sv-SE/gmail.rdf
-isp/tr/gmail.rdf
-isp/uk/gmail.rdf
-isp/zh-CN/gmail.rdf
-isp/zh-TW/gmail.rdf
-license.html
-LICENSE.txt
-modules/JSON.jsm
-modules/quickSearchManager.js
-mozilla-runtime@BIN_SUFFIX@
+@DIR_MACOS@isp/gmail.rdf
+@DIR_MACOS@isp/af/gmail.rdf
+@DIR_MACOS@isp/be/gmail.rdf
+@DIR_MACOS@isp/bg/gmail.rdf
+@DIR_MACOS@isp/ca/gmail.rdf
+@DIR_MACOS@isp/cs/gmail.rdf
+@DIR_MACOS@isp/da/gmail.rdf
+@DIR_MACOS@isp/de/googlemail.rdf
+@DIR_MACOS@isp/el/gmail.rdf
+@DIR_MACOS@isp/en-US/gmail.rdf
+@DIR_MACOS@isp/en-GB/googlemail.rdf
+@DIR_MACOS@isp/es-ES/gmail.rdf
+@DIR_MACOS@isp/es-AR/gmail.rdf
+@DIR_MACOS@isp/eu/gmail.rdf
+@DIR_MACOS@isp/fi/gmail.rdf
+@DIR_MACOS@isp/fr/gmail.rdf
+@DIR_MACOS@isp/fy-NL/gmail.rdf
+@DIR_MACOS@isp/ga-IE/gmail.rdf
+@DIR_MACOS@isp/gu-IN/gmail.rdf
+@DIR_MACOS@isp/he/gmail.rdf
+@DIR_MACOS@isp/hu/gmail.rdf
+@DIR_MACOS@isp/it/gmail.rdf
+@DIR_MACOS@isp/ja/gmail.rdf
+@DIR_MACOS@isp/ja-JP/gmail.rdf
+@DIR_MACOS@isp/ka/gmail.rdf
+@DIR_MACOS@isp/ko/gmail.rdf
+@DIR_MACOS@isp/lt/gmail.rdf
+@DIR_MACOS@isp/mk/gmail.rdf
+@DIR_MACOS@isp/mn/gmail.rdf
+@DIR_MACOS@isp/nb-NO/gmail.rdf
+@DIR_MACOS@isp/ne-NP/gmail.rdf
+@DIR_MACOS@isp/nl/gmail.rdf
+@DIR_MACOS@isp/nn-NO/gmail.rdf
+@DIR_MACOS@isp/pa-IN/gmail.rdf
+@DIR_MACOS@isp/pl/gmail.rdf
+@DIR_MACOS@isp/pt-BR/gmail.rdf
+@DIR_MACOS@isp/pt-PT/gmail.rdf
+@DIR_MACOS@isp/ro/gmail.rdf
+@DIR_MACOS@isp/ru/gmail.rdf
+@DIR_MACOS@isp/sk/gmail.rdf
+@DIR_MACOS@isp/sl/gmail.rdf
+@DIR_MACOS@isp/sv-SE/gmail.rdf
+@DIR_MACOS@isp/tr/gmail.rdf
+@DIR_MACOS@isp/uk/gmail.rdf
+@DIR_MACOS@isp/zh-CN/gmail.rdf
+@DIR_MACOS@isp/zh-TW/gmail.rdf
+@DIR_MACOS@license.html
+@DIR_MACOS@LICENSE.txt
+@DIR_MACOS@modules/JSON.jsm
+@DIR_MACOS@modules/quickSearchManager.js
+@DIR_MACOS@mozilla-runtime@BIN_SUFFIX@
 #ifdef XP_WIN
   #if MOZ_MSVC_REDIST != 1400
     Microsoft.VC80.CRT.manifest
     msvcm80.dll
     msvcp80.dll
     msvcr80.dll
   #endif
   #if MOZ_MSVC_REDIST != 1500
@@ -301,609 +313,611 @@ mozilla-runtime@BIN_SUFFIX@
     msvcr100.dll
   #endif
   #if MOZ_MSVC_REDIST != 1700
     msvcp110.dll
     msvcr110.dll
   #endif
 #endif
 #ifdef XP_MACOSX
-  ../Plug-Ins/PrintPDE.plugin/Contents/Info.plist
-  ../Plug-Ins/PrintPDE.plugin/Contents/MacOS/PrintPDE
-  ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings
-  ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib
-  ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib
-  ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/Info.plist
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/MacOS/PrintPDE
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib
+  Contents/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib
 #endif
-plugins/
-README.txt
-res/bloatcycle.html
-res/broken-image.gif
-res/cmessage.txt
-res/arrow.gif
-res/arrowd.gif
-res/charsetData.properties
-res/charsetalias.properties
-res/forms.css
-res/hiddenWindow.html
-res/html.css
-res/maccharset.properties
-res/mathml.css
-res/os2charset.properties
-res/quirk.css
-res/ua.css
-res/viewsource.css
-res/unixcharset.properties
-res/wincharset.properties
-res/loading-image.gif
-res/platform-forms.css
-res/sample.unixpsfonts.properties
-res/builtin/htmlBindings.xml
-res/builtin/platformHTMLBindings.xml
-res/builtin/
+@DIR_MACOS@plugins/
+@DIR_MACOS@README.txt
+@DIR_MACOS@res/bloatcycle.html
+@DIR_MACOS@res/broken-image.gif
+@DIR_MACOS@res/cmessage.txt
+@DIR_MACOS@res/arrow.gif
+@DIR_MACOS@res/arrowd.gif
+@DIR_MACOS@res/charsetData.properties
+@DIR_MACOS@res/charsetalias.properties
+@DIR_MACOS@res/forms.css
+@DIR_MACOS@res/hiddenWindow.html
+@DIR_MACOS@res/html.css
+@DIR_MACOS@res/maccharset.properties
+@DIR_MACOS@res/mathml.css
+@DIR_MACOS@res/os2charset.properties
+@DIR_MACOS@res/quirk.css
+@DIR_MACOS@res/ua.css
+@DIR_MACOS@res/viewsource.css
+@DIR_MACOS@res/unixcharset.properties
+@DIR_MACOS@res/wincharset.properties
+@DIR_MACOS@res/loading-image.gif
+@DIR_MACOS@res/platform-forms.css
+@DIR_MACOS@res/sample.unixpsfonts.properties
+@DIR_MACOS@res/builtin/htmlBindings.xml
+@DIR_MACOS@res/builtin/platformHTMLBindings.xml
+@DIR_MACOS@res/builtin/
 #ifdef XP_MACOSX
-  res/cursors/CVS/Entries
-  res/cursors/CVS/Repository
-  res/cursors/CVS/Root
-  res/cursors/CVS/Tag
+  @DIR_MACOS@res/cursors/CVS/Entries
+  @DIR_MACOS@res/cursors/CVS/Repository
+  @DIR_MACOS@res/cursors/CVS/Root
+  @DIR_MACOS@res/cursors/CVS/Tag
 #endif
-res/fonts/fontEncoding.properties
-res/fonts/pangoFontEncoding.properties
-res/html/gopher-audio.gif
-res/html/gopher-binary.gif
-res/html/gopher-find.gif
-res/html/gopher-image.gif
-res/html/gopher-menu.gif
-res/html/gopher-movie.gif
-res/html/gopher-sound.gif
-res/html/gopher-telnet.gif
-res/html/gopher-text.gif
-res/html/gopher-unknown.gif
-@DLL_PREFIX@sqlite3@DLL_SUFFIX@
+@DIR_MACOS@res/fonts/fontEncoding.properties
+@DIR_MACOS@res/fonts/pangoFontEncoding.properties
+@DIR_MACOS@res/html/gopher-audio.gif
+@DIR_MACOS@res/html/gopher-binary.gif
+@DIR_MACOS@res/html/gopher-find.gif
+@DIR_MACOS@res/html/gopher-image.gif
+@DIR_MACOS@res/html/gopher-menu.gif
+@DIR_MACOS@res/html/gopher-movie.gif
+@DIR_MACOS@res/html/gopher-sound.gif
+@DIR_MACOS@res/html/gopher-telnet.gif
+@DIR_MACOS@res/html/gopher-text.gif
+@DIR_MACOS@res/html/gopher-unknown.gif
+@DIR_MACOS@@DLL_PREFIX@sqlite3@DLL_SUFFIX@
 #ifdef XP_MACOSX
-  Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Info.plist
-  Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/MacOS/Thunderbird
-  Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/schema.xml
-  Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/English.lproj/InfoPlist.strings
-  Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/English.lproj/schema.strings
+  @DIR_MACOS@Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Info.plist
+  @DIR_MACOS@Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/MacOS/Thunderbird
+  @DIR_MACOS@Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/schema.xml
+  @DIR_MACOS@Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/English.lproj/InfoPlist.strings
+  @DIR_MACOS@Thunderbird.app/Contents/Library/Spotlight/Thunderbird.mdimporter/Contents/Resources/English.lproj/schema.strings
 #endif
+#ifdef XP_WIN
 uninstall/UninstallThunderbird.exe
 uninstall/uninst.exe
 uninstall/uninstall.exe
+#endif
 #ifdef XP_MACOSX
-  updater.app/Contents/MacOS/updater.ini
+  @DIR_MACOS@updater.app/Contents/MacOS/updater.ini
 #endif
-.autoreg
-component.reg
-@DLL_PREFIX@jemalloc@DLL_SUFFIX@
-@DLL_PREFIX@mozutils@DLL_SUFFIX@
+@DIR_MACOS@.autoreg
+@DIR_MACOS@component.reg
+@DIR_MACOS@@DLL_PREFIX@jemalloc@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@mozutils@DLL_SUFFIX@
 #ifdef XP_WIN
   mozcrt19.dll
   mozcpp19.dll
 #endif
 #ifdef MOZ_STATIC_JS
-@DLL_PREFIX@mozjs@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-mozilla-installer-bin
-nsldap32v50.dll
-@DLL_PREFIX@ldap50@DLL_SUFFIX@
-nsldappr32v50.dll
-@DLL_PREFIX@prldap50@DLL_SUFFIX@
-redo-prebinding.sh
-regxpcom.exe
+@DIR_MACOS@mozilla-installer-bin
+@DIR_MACOS@nsldap32v50.dll
+@DIR_MACOS@@DLL_PREFIX@ldap50@DLL_SUFFIX@
+@DIR_MACOS@nsldappr32v50.dll
+@DIR_MACOS@@DLL_PREFIX@prldap50@DLL_SUFFIX@
+@DIR_MACOS@redo-prebinding.sh
+@DIR_MACOS@regxpcom.exe
 #ifdef XP_WIN
   xpicleanup.exe
 #else
-  xpicleanup
+  @DIR_MACOS@xpicleanup
 #endif
-@DLL_PREFIX@xpcom@DLL_SUFFIX@
-@DLL_PREFIX@xpcom_compat@DLL_SUFFIX@
-@DLL_PREFIX@xpistub@DLL_SUFFIX@
-@DLL_PREFIX@zlib@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@xpcom@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@xpcom_compat@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@xpistub@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@zlib@DLL_SUFFIX@
 #ifdef XP_WIN
   js3250.dll
 #endif
 # ****************************************************************************
 # * End generic removals section.                                            *
 # ****************************************************************************
 
 # ****************************************************************************
 # * Remove the files that were included in the omnijar at the time of the    *
 # * switch to omnijar. If a file is removed from the build later, it should  *
 # * be moved up to the generic removals section, but new files need not be   *
 # * added to this section.                                                   *
 # ****************************************************************************
 
 #ifdef MOZ_OMNIJAR
-  omni.jar
-  chrome/@AB_CD@.jar
-  chrome/@AB_CD@.manifest
-  chrome/classic.jar
-  chrome/classic.manifest
-  chrome/comm.jar
-  chrome/comm.manifest
-  chrome/gloda.jar
-  chrome/gloda.manifest
-  chrome/localized.manifest
-  chrome/messenger.jar
-  chrome/messenger.manifest
-  chrome/newsblog.jar
-  chrome/newsblog.manifest
-  chrome/nonlocalized.manifest
-  chrome/pippki.jar
-  chrome/pippki.manifest
-  chrome/toolkit.jar
-  chrome/toolkit.manifest
-  components/addonManager.js
-  components/amContentHandler.js
-  components/amWebInstallListener.js
-  components/binary.manifest
-  components/ConsoleAPI.js
-  components/contentAreaDropListener.js
-  components/contentSecurityPolicy.js
-  components/crypto-SDR.js
-  components/FeedProcessor.js
-  components/glautocomp.js
-  components/GPSDGeolocationProvider.js
-  components/interfaces.manifest
-  components/jsconsole-clhandler.js
-  components/jsmimeemitter.js
-  components/mail.xpt
-  components/mailContentHandler.js
-  components/mdn-service.js
-  components/msgAsyncPrompter.js
-  components/NetworkGeolocationProvider.js
-  components/newsblog.js
-  components/newsblog.manifest
-  components/nsAbAutoCompleteMyDomain.js
-  components/nsAbAutoCompleteSearch.js
-  components/nsAbLDAPAttributeMap.js
-  components/nsActivity.js
-  components/nsActivityManager.js
-  components/nsActivityManagerUI.js
-  components/nsBadCertHandler.js
-  components/nsBlocklistService.js
-  components/nsContentDispatchChooser.js
-  components/nsContentPrefService.js
-  components/nsDefaultCLH.js
-  components/nsDownloadManagerUI.js
+  @DIR_MACOS@omni.jar
+  @DIR_MACOS@chrome/@AB_CD@.jar
+  @DIR_MACOS@chrome/@AB_CD@.manifest
+  @DIR_MACOS@chrome/classic.jar
+  @DIR_MACOS@chrome/classic.manifest
+  @DIR_MACOS@chrome/comm.jar
+  @DIR_MACOS@chrome/comm.manifest
+  @DIR_MACOS@chrome/gloda.jar
+  @DIR_MACOS@chrome/gloda.manifest
+  @DIR_MACOS@chrome/localized.manifest
+  @DIR_MACOS@chrome/messenger.jar
+  @DIR_MACOS@chrome/messenger.manifest
+  @DIR_MACOS@chrome/newsblog.jar
+  @DIR_MACOS@chrome/newsblog.manifest
+  @DIR_MACOS@chrome/nonlocalized.manifest
+  @DIR_MACOS@chrome/pippki.jar
+  @DIR_MACOS@chrome/pippki.manifest
+  @DIR_MACOS@chrome/toolkit.jar
+  @DIR_MACOS@chrome/toolkit.manifest
+  @DIR_MACOS@components/addonManager.js
+  @DIR_MACOS@components/amContentHandler.js
+  @DIR_MACOS@components/amWebInstallListener.js
+  @DIR_MACOS@components/binary.manifest
+  @DIR_MACOS@components/ConsoleAPI.js
+  @DIR_MACOS@components/contentAreaDropListener.js
+  @DIR_MACOS@components/contentSecurityPolicy.js
+  @DIR_MACOS@components/crypto-SDR.js
+  @DIR_MACOS@components/FeedProcessor.js
+  @DIR_MACOS@components/glautocomp.js
+  @DIR_MACOS@components/GPSDGeolocationProvider.js
+  @DIR_MACOS@components/interfaces.manifest
+  @DIR_MACOS@components/jsconsole-clhandler.js
+  @DIR_MACOS@components/jsmimeemitter.js
+  @DIR_MACOS@components/mail.xpt
+  @DIR_MACOS@components/mailContentHandler.js
+  @DIR_MACOS@components/mdn-service.js
+  @DIR_MACOS@components/msgAsyncPrompter.js
+  @DIR_MACOS@components/NetworkGeolocationProvider.js
+  @DIR_MACOS@components/newsblog.js
+  @DIR_MACOS@components/newsblog.manifest
+  @DIR_MACOS@components/nsAbAutoCompleteMyDomain.js
+  @DIR_MACOS@components/nsAbAutoCompleteSearch.js
+  @DIR_MACOS@components/nsAbLDAPAttributeMap.js
+  @DIR_MACOS@components/nsActivity.js
+  @DIR_MACOS@components/nsActivityManager.js
+  @DIR_MACOS@components/nsActivityManagerUI.js
+  @DIR_MACOS@components/nsBadCertHandler.js
+  @DIR_MACOS@components/nsBlocklistService.js
+  @DIR_MACOS@components/nsContentDispatchChooser.js
+  @DIR_MACOS@components/nsContentPrefService.js
+  @DIR_MACOS@components/nsDefaultCLH.js
+  @DIR_MACOS@components/nsDownloadManagerUI.js
   #ifdef XP_UNIX
     #ifndef XP_MACOSX
       components/nsFilePicker.js
     #endif
   #endif
-  components/nsFormAutoComplete.js
-  components/nsFormHistory.js
-  components/nsHandlerService.js
-  components/nsHelperAppDlg.js
-  components/nsINIProcessor.js
-  components/nsInputListAutoComplete.js
-  components/nsLDAPProtocolHandler.js
-  components/nsLivemarkService.js
-  components/nsLoginInfo.js
-  components/nsLoginManager.js
-  components/nsLoginManagerPrompter.js
-  components/nsMailDefaultHandler.js
-  components/nsMailNewsCommandLineHandler.js
-  components/nsMicrosummaryService.js
-  components/nsMsgTraitService.js
-  components/nsPhishingProtectionApplication.js
-  components/nsPlacesAutoComplete.js
-  components/nsPlacesDBFlush.js
-  components/nsPlacesExpiration.js
-  components/nsPrompter.js
-  components/nsSMTPProtocolHandler.js
-  components/nsSetDefaultMail.js
-  components/nsTaggingService.js
-  components/nsTryToClose.js
-  components/nsURLFormatter.js
-  components/nsUpdateService.js
-  components/nsUpdateServiceStub.js
-  components/nsUpdateTimerManager.js
-  components/nsUrlClassifierLib.js
-  components/nsUrlClassifierListManager.js
-  components/nsWebHandlerApp.js
-  components/offlineStartup.js
-  components/PlacesCategoriesStarter.js
-  components/smime-service.js
-  components/steelApplication.js
-  components/storage-Legacy.js
-  components/storage-mozStorage.js
-  components/txEXSLTRegExFunctions.js
-  defaults/autoconfig/platform.js
-  defaults/autoconfig/prefcalls.js
-  defaults/pref/all-l10n.js
-  defaults/pref/all-thunderbird.js
-  defaults/pref/composer.js
-  defaults/pref/mailnews.js
-  defaults/pref/mdn.js
-  defaults/pref/smime.js
-  defaults/pref/thunderbird-branding.js
-  defaults/profile/localstore.rdf
-  defaults/profile/mimeTypes.rdf
-  defaults/profile/prefs.js
-  defaults/greprefs.js
-  modules/AddonLogging.jsm
-  modules/AddonManager.jsm
-  modules/AddonRepository.jsm
-  modules/AddonUpdateChecker.jsm
-  modules/CSPUtils.jsm
-  modules/CertUtils.jsm
-  modules/CommonDialog.jsm
-  modules/CrashSubmit.jsm
-  modules/DownloadLastDir.jsm
-  modules/DownloadPaths.jsm
+  @DIR_MACOS@components/nsFormAutoComplete.js
+  @DIR_MACOS@components/nsFormHistory.js
+  @DIR_MACOS@components/nsHandlerService.js
+  @DIR_MACOS@components/nsHelperAppDlg.js
+  @DIR_MACOS@components/nsINIProcessor.js
+  @DIR_MACOS@components/nsInputListAutoComplete.js
+  @DIR_MACOS@components/nsLDAPProtocolHandler.js
+  @DIR_MACOS@components/nsLivemarkService.js
+  @DIR_MACOS@components/nsLoginInfo.js
+  @DIR_MACOS@components/nsLoginManager.js
+  @DIR_MACOS@components/nsLoginManagerPrompter.js
+  @DIR_MACOS@components/nsMailDefaultHandler.js
+  @DIR_MACOS@components/nsMailNewsCommandLineHandler.js
+  @DIR_MACOS@components/nsMicrosummaryService.js
+  @DIR_MACOS@components/nsMsgTraitService.js
+  @DIR_MACOS@components/nsPhishingProtectionApplication.js
+  @DIR_MACOS@components/nsPlacesAutoComplete.js
+  @DIR_MACOS@components/nsPlacesDBFlush.js
+  @DIR_MACOS@components/nsPlacesExpiration.js
+  @DIR_MACOS@components/nsPrompter.js
+  @DIR_MACOS@components/nsSMTPProtocolHandler.js
+  @DIR_MACOS@components/nsSetDefaultMail.js
+  @DIR_MACOS@components/nsTaggingService.js
+  @DIR_MACOS@components/nsTryToClose.js
+  @DIR_MACOS@components/nsURLFormatter.js
+  @DIR_MACOS@components/nsUpdateService.js
+  @DIR_MACOS@components/nsUpdateServiceStub.js
+  @DIR_MACOS@components/nsUpdateTimerManager.js
+  @DIR_MACOS@components/nsUrlClassifierLib.js
+  @DIR_MACOS@components/nsUrlClassifierListManager.js
+  @DIR_MACOS@components/nsWebHandlerApp.js
+  @DIR_MACOS@components/offlineStartup.js
+  @DIR_MACOS@components/PlacesCategoriesStarter.js
+  @DIR_MACOS@components/smime-service.js
+  @DIR_MACOS@components/steelApplication.js
+  @DIR_MACOS@components/storage-Legacy.js
+  @DIR_MACOS@components/storage-mozStorage.js
+  @DIR_MACOS@components/txEXSLTRegExFunctions.js
+  @DIR_MACOS@defaults/autoconfig/platform.js
+  @DIR_MACOS@defaults/autoconfig/prefcalls.js
+  @DIR_MACOS@defaults/pref/all-l10n.js
+  @DIR_MACOS@defaults/pref/all-thunderbird.js
+  @DIR_MACOS@defaults/pref/composer.js
+  @DIR_MACOS@defaults/pref/mailnews.js
+  @DIR_MACOS@defaults/pref/mdn.js
+  @DIR_MACOS@defaults/pref/smime.js
+  @DIR_MACOS@defaults/pref/thunderbird-branding.js
+  @DIR_MACOS@defaults/profile/localstore.rdf
+  @DIR_MACOS@defaults/profile/mimeTypes.rdf
+  @DIR_MACOS@defaults/profile/prefs.js
+  @DIR_MACOS@defaults/greprefs.js
+  @DIR_MACOS@modules/AddonLogging.jsm
+  @DIR_MACOS@modules/AddonManager.jsm
+  @DIR_MACOS@modules/AddonRepository.jsm
+  @DIR_MACOS@modules/AddonUpdateChecker.jsm
+  @DIR_MACOS@modules/CSPUtils.jsm
+  @DIR_MACOS@modules/CertUtils.jsm
+  @DIR_MACOS@modules/CommonDialog.jsm
+  @DIR_MACOS@modules/CrashSubmit.jsm
+  @DIR_MACOS@modules/DownloadLastDir.jsm
+  @DIR_MACOS@modules/DownloadPaths.jsm
   #ifdef XP_WIN
     modules/DownloadTaskbarProgress.jsm
   #endif
-  modules/DownloadUtils.jsm
-  modules/FileUtils.jsm
-  modules/Geometry.jsm
-  modules/IOUtils.js
-  modules/ISO8601DateUtils.jsm
-  modules/InlineSpellChecker.jsm
-  modules/LightweightThemeConsumer.jsm
-  modules/LightweightThemeManager.jsm
-  modules/MailConsts.js
-  modules/MailUtils.js
-  modules/Microformats.js
-  modules/MsgHdrSyntheticView.js
-  modules/NetUtil.jsm
-  modules/PerfMeasurement.jsm
-  modules/PlacesDBUtils.jsm
-  modules/PlacesUtils.jsm
-  modules/PluginProvider.jsm
-  modules/PluralForm.jsm
-  modules/PopupNotifications.jsm
-  modules/SearchIntegration.js
-  modules/Services.jsm
-  modules/SpatialNavigation.js
+  @DIR_MACOS@modules/DownloadUtils.jsm
+  @DIR_MACOS@modules/FileUtils.jsm
+  @DIR_MACOS@modules/Geometry.jsm
+  @DIR_MACOS@modules/IOUtils.js
+  @DIR_MACOS@modules/ISO8601DateUtils.jsm
+  @DIR_MACOS@modules/InlineSpellChecker.jsm
+  @DIR_MACOS@modules/LightweightThemeConsumer.jsm
+  @DIR_MACOS@modules/LightweightThemeManager.jsm
+  @DIR_MACOS@modules/MailConsts.js
+  @DIR_MACOS@modules/MailUtils.js
+  @DIR_MACOS@modules/Microformats.js
+  @DIR_MACOS@modules/MsgHdrSyntheticView.js
+  @DIR_MACOS@modules/NetUtil.jsm
+  @DIR_MACOS@modules/PerfMeasurement.jsm
+  @DIR_MACOS@modules/PlacesDBUtils.jsm
+  @DIR_MACOS@modules/PlacesUtils.jsm
+  @DIR_MACOS@modules/PluginProvider.jsm
+  @DIR_MACOS@modules/PluralForm.jsm
+  @DIR_MACOS@modules/PopupNotifications.jsm
+  @DIR_MACOS@modules/SearchIntegration.js
+  @DIR_MACOS@modules/Services.jsm
+  @DIR_MACOS@modules/SpatialNavigation.js
   #ifdef XP_MACOSX
-    modules/SpotlightIntegration.js
+    @DIR_MACOS@modules/SpotlightIntegration.js
   #endif
-  modules/StringBundle.js
+  @DIR_MACOS@modules/StringBundle.js
   #ifdef XP_WIN
     modules/WinSearchIntegration.js
   #endif
-  modules/WindowDraggingUtils.jsm
-  modules/XPCOMUtils.jsm
-  modules/XPIProvider.jsm
-  modules/activity/activityModules.js
-  modules/activity/alertHook.js
-  modules/activity/autosync.js
-  modules/activity/glodaIndexer.js
-  modules/activity/moveCopy.js
-  modules/activity/pop3Download.js
-  modules/activity/sendLater.js
-  modules/appIdleManager.js
-  modules/attachmentChecker.js
-  modules/ctypes.jsm
-  modules/dbViewWrapper.js
-  modules/displayNameutils.js
-  modules/debug.js
-  modules/errUtils.js
-  modules/folderUtils.jsm
-  modules/gloda/collection.js
-  modules/gloda/connotent.js
-  modules/gloda/databind.js
-  modules/gloda/datamodel.js
-  modules/gloda/datastore.js
-  modules/gloda/dbview.js
-  modules/gloda/everybody.js
-  modules/gloda/explattr.js
-  modules/gloda/facet.js
-  modules/gloda/fundattr.js
-  modules/gloda/gloda.js
-  modules/gloda/index_ab.js
-  modules/gloda/index_msg.js
-  modules/gloda/indexer.js
-  modules/gloda/log4moz.js
-  modules/gloda/mimeTypeCategories.js
-  modules/gloda/mimemsg.js
-  modules/gloda/msg_search.js
-  modules/gloda/noun_freetag.js
-  modules/gloda/noun_mimetype.js
-  modules/gloda/noun_tag.js
-  modules/gloda/public.js
-  modules/gloda/query.js
-  modules/gloda/suffixtree.js
-  modules/gloda/utils.js
-  modules/iteratorUtils.jsm
-  modules/jsTreeSelection.js
-  modules/mailMigrator.js
-  modules/mailViewManager.js
-  modules/mailnewsMigrator.js
-  modules/nsFormAutoCompleteResult.jsm
-  modules/quickFilterManager.js
-  modules/searchSpec.js
-  modules/sessionStoreManager.js
-  modules/summaryFrameManager.js
-  modules/templateUtils.js
-  modules/traceHelper.js
-  modules/utils.js
-  modules/virtualFolderWrapper.js
-  res/EditorOverride.css
-  res/contenteditable.css
-  res/designmode.css
-  res/dtd/mathml.dtd
-  res/dtd/xhtml11.dtd
-  res/entityTables/html40Latin1.properties
-  res/entityTables/html40Special.properties
-  res/entityTables/html40Symbols.properties
-  res/entityTables/htmlEntityVersions.properties
-  res/entityTables/mathml20.properties
-  res/entityTables/transliterate.properties
-  res/fonts/mathfont.properties
-  res/fonts/mathfontSTIXNonUnicode.properties
-  res/fonts/mathfontSTIXSize1.properties
-  res/fonts/mathfontSTIXSizeOneSym.properties
-  res/fonts/mathfontStandardSymbolsL.properties
+  @DIR_MACOS@modules/WindowDraggingUtils.jsm
+  @DIR_MACOS@modules/XPCOMUtils.jsm
+  @DIR_MACOS@modules/XPIProvider.jsm
+  @DIR_MACOS@modules/activity/activityModules.js
+  @DIR_MACOS@modules/activity/alertHook.js
+  @DIR_MACOS@modules/activity/autosync.js
+  @DIR_MACOS@modules/activity/glodaIndexer.js
+  @DIR_MACOS@modules/activity/moveCopy.js
+  @DIR_MACOS@modules/activity/pop3Download.js
+  @DIR_MACOS@modules/activity/sendLater.js
+  @DIR_MACOS@modules/appIdleManager.js
+  @DIR_MACOS@modules/attachmentChecker.js
+  @DIR_MACOS@modules/ctypes.jsm
+  @DIR_MACOS@modules/dbViewWrapper.js
+  @DIR_MACOS@modules/displayNameutils.js
+  @DIR_MACOS@modules/debug.js
+  @DIR_MACOS@modules/errUtils.js
+  @DIR_MACOS@modules/folderUtils.jsm
+  @DIR_MACOS@modules/gloda/collection.js
+  @DIR_MACOS@modules/gloda/connotent.js
+  @DIR_MACOS@modules/gloda/databind.js
+  @DIR_MACOS@modules/gloda/datamodel.js
+  @DIR_MACOS@modules/gloda/datastore.js
+  @DIR_MACOS@modules/gloda/dbview.js
+  @DIR_MACOS@modules/gloda/everybody.js
+  @DIR_MACOS@modules/gloda/explattr.js
+  @DIR_MACOS@modules/gloda/facet.js
+  @DIR_MACOS@modules/gloda/fundattr.js
+  @DIR_MACOS@modules/gloda/gloda.js
+  @DIR_MACOS@modules/gloda/index_ab.js
+  @DIR_MACOS@modules/gloda/index_msg.js
+  @DIR_MACOS@modules/gloda/indexer.js
+  @DIR_MACOS@modules/gloda/log4moz.js
+  @DIR_MACOS@modules/gloda/mimeTypeCategories.js
+  @DIR_MACOS@modules/gloda/mimemsg.js
+  @DIR_MACOS@modules/gloda/msg_search.js
+  @DIR_MACOS@modules/gloda/noun_freetag.js
+  @DIR_MACOS@modules/gloda/noun_mimetype.js
+  @DIR_MACOS@modules/gloda/noun_tag.js
+  @DIR_MACOS@modules/gloda/public.js
+  @DIR_MACOS@modules/gloda/query.js
+  @DIR_MACOS@modules/gloda/suffixtree.js
+  @DIR_MACOS@modules/gloda/utils.js
+  @DIR_MACOS@modules/iteratorUtils.jsm
+  @DIR_MACOS@modules/jsTreeSelection.js
+  @DIR_MACOS@modules/mailMigrator.js
+  @DIR_MACOS@modules/mailViewManager.js
+  @DIR_MACOS@modules/mailnewsMigrator.js
+  @DIR_MACOS@modules/nsFormAutoCompleteResult.jsm
+  @DIR_MACOS@modules/quickFilterManager.js
+  @DIR_MACOS@modules/searchSpec.js
+  @DIR_MACOS@modules/sessionStoreManager.js
+  @DIR_MACOS@modules/summaryFrameManager.js
+  @DIR_MACOS@modules/templateUtils.js
+  @DIR_MACOS@modules/traceHelper.js
+  @DIR_MACOS@modules/utils.js
+  @DIR_MACOS@modules/virtualFolderWrapper.js
+  @DIR_MACOS@res/EditorOverride.css
+  @DIR_MACOS@res/contenteditable.css
+  @DIR_MACOS@res/designmode.css
+  @DIR_MACOS@res/dtd/mathml.dtd
+  @DIR_MACOS@res/dtd/xhtml11.dtd
+  @DIR_MACOS@res/entityTables/html40Latin1.properties
+  @DIR_MACOS@res/entityTables/html40Special.properties
+  @DIR_MACOS@res/entityTables/html40Symbols.properties
+  @DIR_MACOS@res/entityTables/htmlEntityVersions.properties
+  @DIR_MACOS@res/entityTables/mathml20.properties
+  @DIR_MACOS@res/entityTables/transliterate.properties
+  @DIR_MACOS@res/fonts/mathfont.properties
+  @DIR_MACOS@res/fonts/mathfontSTIXNonUnicode.properties
+  @DIR_MACOS@res/fonts/mathfontSTIXSize1.properties
+  @DIR_MACOS@res/fonts/mathfontSTIXSizeOneSym.properties
+  @DIR_MACOS@res/fonts/mathfontStandardSymbolsL.properties
   #ifdef XP_WIN
     res/fonts/mathfontSymbol.properties
   #endif
-  res/fonts/mathfontUnicode.properties
-  res/grabber.gif
-  res/html/folder.png
-  res/langGroups.properties
-  res/language.properties
-  res/svg.css
-  res/table-add-column-after-active.gif
-  res/table-add-column-after-hover.gif
-  res/table-add-column-after.gif
-  res/table-add-column-before-active.gif
-  res/table-add-column-before-hover.gif
-  res/table-add-column-before.gif
-  res/table-add-row-after-active.gif
-  res/table-add-row-after-hover.gif
-  res/table-add-row-after.gif
-  res/table-add-row-before-active.gif
-  res/table-add-row-before-hover.gif
-  res/table-add-row-before.gif
-  res/table-remove-column-active.gif
-  res/table-remove-column-hover.gif
-  res/table-remove-column.gif
-  res/table-remove-row-active.gif
-  res/table-remove-row-hover.gif
-  res/table-remove-row.gif
+  @DIR_MACOS@res/fonts/mathfontUnicode.properties
+  @DIR_MACOS@res/grabber.gif
+  @DIR_MACOS@res/html/folder.png
+  @DIR_MACOS@res/langGroups.properties
+  @DIR_MACOS@res/language.properties
+  @DIR_MACOS@res/svg.css
+  @DIR_MACOS@res/table-add-column-after-active.gif
+  @DIR_MACOS@res/table-add-column-after-hover.gif
+  @DIR_MACOS@res/table-add-column-after.gif
+  @DIR_MACOS@res/table-add-column-before-active.gif
+  @DIR_MACOS@res/table-add-column-before-hover.gif
+  @DIR_MACOS@res/table-add-column-before.gif
+  @DIR_MACOS@res/table-add-row-after-active.gif
+  @DIR_MACOS@res/table-add-row-after-hover.gif
+  @DIR_MACOS@res/table-add-row-after.gif
+  @DIR_MACOS@res/table-add-row-before-active.gif
+  @DIR_MACOS@res/table-add-row-before-hover.gif
+  @DIR_MACOS@res/table-add-row-before.gif
+  @DIR_MACOS@res/table-remove-column-active.gif
+  @DIR_MACOS@res/table-remove-column-hover.gif
+  @DIR_MACOS@res/table-remove-column.gif
+  @DIR_MACOS@res/table-remove-row-active.gif
+  @DIR_MACOS@res/table-remove-row-hover.gif
+  @DIR_MACOS@res/table-remove-row.gif
 #else
-  components/binary.manifest
-  omni.jar
-  omni.ja
+  @DIR_MACOS@components/binary.manifest
+  @DIR_MACOS@omni.jar
+  @DIR_MACOS@omni.ja
 #endif
 
 # ****************************************************************************
 # * Remove Talkback files from old location, where they were in 1.0.x        *
 # ****************************************************************************
-components/BrandRes.dll
-components/fullsoft.dll
-components/master.ini
-components/qfaservices.dll
-components/qfaservices.xpt
-components/talkback-l10n.ini
-components/talkback.cnt
-components/talkback.exe
-components/talkback.hlp
-components/libqfaservices.so
-components/talkback/master.ini
-components/talkback/talkback
-components/talkback/talkback.so
-components/talkback/XTalkback.ad
+@DIR_MACOS@components/BrandRes.dll
+@DIR_MACOS@components/fullsoft.dll
+@DIR_MACOS@components/master.ini
+@DIR_MACOS@components/qfaservices.dll
+@DIR_MACOS@components/qfaservices.xpt
+@DIR_MACOS@components/talkback-l10n.ini
+@DIR_MACOS@components/talkback.cnt
+@DIR_MACOS@components/talkback.exe
+@DIR_MACOS@components/talkback.hlp
+@DIR_MACOS@components/libqfaservices.so
+@DIR_MACOS@components/talkback/master.ini
+@DIR_MACOS@components/talkback/talkback
+@DIR_MACOS@components/talkback/talkback.so
+@DIR_MACOS@components/talkback/XTalkback.ad
 # **************************************************************************##
 # * Remove Talkback files from new location, where they were in 1.5.x and    *
 # * 2.0.x.                                                                   *
 # ****************************************************************************
-extensions/talkback@mozilla.org/
-extensions/talkback@mozilla.org/install.rdf
-extensions/talkback@mozilla.org/chrome.manifest
-extensions/talkback@mozilla.org/components/qfaservices.xpt
-extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@
+@DIR_MACOS@extensions/talkback@mozilla.org/
+@DIR_MACOS@extensions/talkback@mozilla.org/install.rdf
+@DIR_MACOS@extensions/talkback@mozilla.org/chrome.manifest
+@DIR_MACOS@extensions/talkback@mozilla.org/components/qfaservices.xpt
+@DIR_MACOS@extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@
 #ifdef XP_WIN
   extensions/talkback@mozilla.org/components/BrandRes.dll
   extensions/talkback@mozilla.org/components/fullsoft.dll
   extensions/talkback@mozilla.org/components/master.ini
   extensions/talkback@mozilla.org/components/talkback-l10n.ini
   extensions/talkback@mozilla.org/components/talkback.cnt
   extensions/talkback@mozilla.org/components/talkback.exe
   extensions/talkback@mozilla.org/components/talkback.hlp
   extensions/talkback@mozilla.org/InstallDisabled
 #else
   #ifdef XP_MACOSX
-    extensions/talkback@mozilla.org/components/talkback/master.ini
-    extensions/talkback@mozilla.org/components/talkback/talkback@DLL_SUFFIX@
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Info.plist
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/MacOS/Talkback
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/pbdevelopment.plist
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/PkgInfo
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/delete.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/disable.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/enable.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/classes.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/info.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/objects.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/InfoPlist.strings
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/classes.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/info.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/objects.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/Localizable.strings
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/classes.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/info.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/objects.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/classes.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/info.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/objects.nib
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoKeys.plist
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoSections.plist
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/send.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff
-    extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/master.ini
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/talkback@DLL_SUFFIX@
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Info.plist
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/MacOS/Talkback
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/pbdevelopment.plist
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/PkgInfo
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/delete.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/disable.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/enable.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/classes.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/info.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/objects.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/InfoPlist.strings
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/classes.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/info.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/objects.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/Localizable.strings
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/classes.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/info.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/objects.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/classes.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/info.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/objects.nib
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoKeys.plist
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoSections.plist
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/send.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff
+    @DIR_MACOS@extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns
   #else
     extensions/talkback@mozilla.org/components/talkback/talkback
     extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
     extensions/talkback@mozilla.org/components/talkback/master.ini
     extensions/talkback@mozilla.org/components/talkback/talkback.so
   #endif
 #endif
 # ****************************************************************************
 # * End removing Talkback.                                                   *
 # ****************************************************************************
 
 # ****************************************************************************
 # * Remove pre-extension PalmSync files.                                     *
 # ****************************************************************************
-HSAPI.dll
-CondMgr.dll
-mozABConduit.dll
-components/palmsync.dll
-components/palmSync.xpt
+@DIR_MACOS@HSAPI.dll
+@DIR_MACOS@CondMgr.dll
+@DIR_MACOS@mozABConduit.dll
+@DIR_MACOS@components/palmsync.dll
+@DIR_MACOS@components/palmSync.xpt
 # ****************************************************************************
 # * End pre-extensions PalmSync files.                                       *
 # ****************************************************************************
 
 # ****************************************************************************
 # * The first of two chunks of removing shared libraries: this removes the   *
 # * shared libraries if we are going from a current shared build to a static *
 # * build, although unlikely, we'll keep them in here anyway.                *
 # * The next removes the Windows dlls that were present when                 *
 # * we switched to static builds by default, in 2004-05. If a new library is *
 # * added, it should be added here, if a library is removed, the dll should  *
 # * be added below if it was present in 2004.                                *
 # ****************************************************************************
-components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
-components/@DLL_PREFIX@appshell@DLL_SUFFIX@
-components/@DLL_PREFIX@auth@DLL_SUFFIX@
-components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
-components/@DLL_PREFIX@caps@DLL_SUFFIX@
-components/@DLL_PREFIX@chardet@DLL_SUFFIX@
-components/@DLL_PREFIX@chrome@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@appshell@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@auth@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@caps@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@chardet@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@chrome@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@composer@DLL_SUFFIX@
-components/@DLL_PREFIX@cookie@DLL_SUFFIX@
-components/@DLL_PREFIX@docshell@DLL_SUFFIX@
-components/@DLL_PREFIX@embedcomponents@DLL_SUFFIX@
-components/@DLL_PREFIX@fileview@DLL_SUFFIX@
-components/@DLL_PREFIX@gkgfxthebes@DLL_SUFFIX@
-components/@DLL_PREFIX@gklayout@DLL_SUFFIX@
-components/@DLL_PREFIX@gkplugin@DLL_SUFFIX@
-components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@composer@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@cookie@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@docshell@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@embedcomponents@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@fileview@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@gkgfxthebes@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@gklayout@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@gkplugin@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@i18n@DLL_SUFFIX@
-components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
-components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
-components/@DLL_PREFIX@import@DLL_SUFFIX@
-components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
-components/@DLL_PREFIX@jar50@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@i18n@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@import@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #ifndef XP_WIN
-  components/@DLL_PREFIX@jsd@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@jsd@DLL_SUFFIX@
 #else
   components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@mail@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@mail@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
-components/@DLL_PREFIX@mork@DLL_SUFFIX@
-components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
-components/@DLL_PREFIX@mozldap@DLL_SUFFIX@
-components/@DLL_PREFIX@msgMapi@DLL_SUFFIX@
-components/@DLL_PREFIX@msgsmime@DLL_SUFFIX@
-components/@DLL_PREFIX@necko@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@mork@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@mozldap@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@msgMapi@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@msgsmime@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@necko@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@appshell@DLL_SUFFIX@
   components/@DLL_PREFIX@perms@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
-  components/@DLL_PREFIX@permissions@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@permissions@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@pipboot@DLL_SUFFIX@
-components/@DLL_PREFIX@pipnss@DLL_SUFFIX@
-components/@DLL_PREFIX@pippki@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@pipboot@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@pipnss@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@pippki@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@xppref32@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@pref@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@pref@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@rdf@DLL_SUFFIX@
-components/@DLL_PREFIX@remoteservice@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@rdf@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@remoteservice@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
   components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
-  components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@system-pref@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@system-pref@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
   components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
-  components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@txmgr@DLL_SUFFIX@
-components/@DLL_PREFIX@uconv@DLL_SUFFIX@
-components/@DLL_PREFIX@ucvmath@DLL_SUFFIX@
-components/@DLL_PREFIX@universalchardet@DLL_SUFFIX@
-components/@DLL_PREFIX@unixproxy@DLL_SUFFIX@
-components/@DLL_PREFIX@osxproxy@DLL_SUFFIX@
-components/@DLL_PREFIX@webbrwsr@DLL_SUFFIX@
-components/@DLL_PREFIX@widget_gtk2@DLL_SUFFIX@
-components/@DLL_PREFIX@widget_mac@DLL_SUFFIX@
-components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
-components/@DLL_PREFIX@windowds@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@txmgr@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@uconv@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@ucvmath@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@universalchardet@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@unixproxy@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@osxproxy@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@webbrwsr@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@widget_gtk2@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@widget_mac@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@windowds@DLL_SUFFIX@
 #ifdef XP_WIN
   components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
   components/@DLL_PREFIX@xpc3250@DLL_SUFFIX@
 #else
-  components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
-  components/@DLL_PREFIX@xpconnect@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
+  @DIR_MACOS@components/@DLL_PREFIX@xpconnect@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@zipwriter@DLL_SUFFIX@
-@DLL_PREFIX@gfxpsshar@DLL_SUFFIX@
-@DLL_PREFIX@gkgfx@DLL_SUFFIX@
-@DLL_PREFIX@gtkxtbin@DLL_SUFFIX@
-@DLL_PREFIX@mozz@DLL_SUFFIX@
-@DLL_PREFIX@thebes@DLL_SUFFIX@
+@DIR_MACOS@components/@DLL_PREFIX@zipwriter@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@gfxpsshar@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@gkgfx@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@gtkxtbin@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@mozz@DLL_SUFFIX@
+@DIR_MACOS@@DLL_PREFIX@thebes@DLL_SUFFIX@
 #ifdef XP_WIN
   xpcshell.exe
 #else
-  xpcshell
+  @DIR_MACOS@xpcshell
 #endif
 # ****************************************************************************
 # * End removing current shared libraries                                    *
 # ****************************************************************************
 
 # ****************************************************************************
 # * Remove the DLLs that were present at the time (2004-05) when we started  *
 # * shipping static builds on Windows, except for current shared libraries,  *
 # * which are removed above.                                                 *
 # ****************************************************************************
-components/appcomps.dll
-components/editor.dll
-components/gkgfxwin.dll
-components/jsdom.dll
-components/necko2.dll
-components/nsprefm.dll
-components/profile.dll
-components/profilemigration.dll
-components/wlltvwrs.dll
-components/xmlextras.dll
-components/xmlextras.xpt
+@DIR_MACOS@components/appcomps.dll
+@DIR_MACOS@components/editor.dll
+@DIR_MACOS@components/gkgfxwin.dll
+@DIR_MACOS@components/jsdom.dll
+@DIR_MACOS@components/necko2.dll
+@DIR_MACOS@components/nsprefm.dll
+@DIR_MACOS@components/profile.dll
+@DIR_MACOS@components/profilemigration.dll
+@DIR_MACOS@components/wlltvwrs.dll
+@DIR_MACOS@components/xmlextras.dll
+@DIR_MACOS@components/xmlextras.xpt
 # ****************************************************************************
 # * End removing old shared dlls.                                            *
 # ****************************************************************************
 
 # ****************************************************************************
 # * Remove the XPTs that were present at the time (2004-09) when we started  *
 # * linking XPTs on Windows. You almost certainly don't want to add anything *
 # * to this section.                                                         *
@@ -1032,171 +1046,171 @@ components/xmlextras.xpt
 
 # ****************************************************************************
 # * Remove the XPTs that were present at the time (2009-04) when we started  *
 # * linking XPTs on Linux, and present at the time (2009-08) when we started *
 # * linking XPTs on Mac, plus XPTs that shipped with 3.0 (which didn't link  *
 # * XPTs). You almost certainly don't want to add anything to this section.  *
 # ****************************************************************************
 #ifdef XP_UNIX
-  components/activity.xpt
-  components/addrbook.xpt
-  components/alerts.xpt
-  components/appshell.xpt
-  components/appstartup.xpt
-  components/autocomplete.xpt
-  components/autoconfig.xpt
-  components/caps.xpt
-  components/chrome.xpt
-  components/commandhandler.xpt
-  components/commandlines.xpt
-  components/composer.xpt
-  components/content_base.xpt
-  components/content_html.xpt
-  components/content_htmldoc.xpt
-  components/content_xmldoc.xpt
-  components/content_xslt.xpt
-  components/content_xtf.xpt
-  components/contentprefs.xpt
-  components/cookie.xpt
-  components/docshell.xpt
-  components/dom.xpt
-  components/dom_base.xpt
-  components/dom_canvas.xpt
-  components/dom_core.xpt
-  components/dom_css.xpt
-  components/dom_events.xpt
-  components/dom_geolocation.xpt
-  components/dom_html.xpt
-  components/dom_json.xpt
-  components/dom_offline.xpt
-  components/dom_range.xpt
-  components/dom_sidebar.xpt
-  components/dom_smil.xpt
-  components/dom_storage.xpt
-  components/dom_stylesheets.xpt
-  components/dom_svg.xpt
-  components/dom_threads.xpt
-  components/dom_traversal.xpt
-  components/dom_views.xpt
-  components/dom_xbl.xpt
-  components/dom_xpath.xpt
-  components/dom_xul.xpt
-  components/downloads.xpt
-  components/editor.xpt
-  components/embed_base.xpt
-  components/extensions.xpt
-  components/exthandler.xpt
-  components/exthelper.xpt
-  components/fastfind.xpt
-  components/feeds.xpt
-  components/find.xpt
-  components/fts3tok.xpt
-  components/gfx.xpt
-  components/htmlparser.xpt
-  components/imgicon.xpt
-  components/imglib2.xpt
-  components/impComm4xMail.xpt
-  components/import.xpt
-  components/inspector.xpt
-  components/intl.xpt
-  components/jar.xpt
-  components/jsdservice.xpt
-  components/layout_base.xpt
-  components/layout_printing.xpt
-  components/layout_xul.xpt
-  components/layout_xul_tree.xpt
-  components/locale.xpt
-  components/loginmgr.xpt
-  components/lwbrk.xpt
-  components/mailprofilemigration.xpt
-  components/mailview.xpt
-  components/mime.xpt
-  components/mimetype.xpt
-  components/mozbrwsr.xpt
-  components/mozfind.xpt
-  components/mozldap.xpt
-  components/msgbase.xpt
-  components/msgcompose.xpt
-  components/msgdb.xpt
-  components/msgimap.xpt
-  components/msglocal.xpt
-  components/msgnews.xpt
-  components/msgsearch.xpt
-  components/msgsmime.xpt
-  components/necko.xpt
-  components/necko_about.xpt
-  components/necko_cache.xpt
-  components/necko_cookie.xpt
-  components/necko_dns.xpt
-  components/necko_file.xpt
-  components/necko_ftp.xpt
-  components/necko_http.xpt
-  components/necko_res.xpt
-  components/necko_socket.xpt
-  components/necko_strconv.xpt
-  components/necko_viewsource.xpt
-  components/necko_wifi.xpt
-  components/parentalcontrols.xpt
-  components/pipboot.xpt
-  components/pipnss.xpt
-  components/pippki.xpt
-  components/places.xpt
-  components/plugin.xpt
-  components/prefetch.xpt
-  components/pref.xpt
-  components/profile.xpt
-  components/proxyObjInst.xpt
-  components/rdf.xpt
-  components/satchel.xpt
-  components/saxparser.xpt
-  components/shellservice.xpt
-  components/shistory.xpt
-  components/spellchecker.xpt
-  components/steel.xpt
-  components/storage.xpt
-  components/toolkitprofile.xpt
-  components/txmgr.xpt
-  components/txtsvc.xpt
-  components/uconv.xpt
-  components/unicharutil.xpt
-  components/update.xpt
-  components/uriloader.xpt
-  components/url-classifier.xpt
-  components/urlformatter.xpt
-  components/webBrowser_core.xpt
-  components/webbrowserpersist.xpt
-  components/webshell_idls.xpt
-  components/widget.xpt
-  components/windowds.xpt
-  components/windowwatcher.xpt
-  components/xpautocomplete.xpt
-  components/xpcom_base.xpt
-  components/xpcom_components.xpt
-  components/xpcom_ds.xpt
-  components/xpcom_io.xpt
-  components/xpcom_system.xpt
-  components/xpcom_threads.xpt
-  components/xpcom_xpti.xpt
-  components/xpconnect.xpt
-  components/xpinstall.xpt
-  components/xulapp.xpt
-  components/xuldoc.xpt
-  components/xultmpl.xpt
-  components/zipwriter.xpt
+  @DIR_MACOS@components/activity.xpt
+  @DIR_MACOS@components/addrbook.xpt
+  @DIR_MACOS@components/alerts.xpt
+  @DIR_MACOS@components/appshell.xpt
+  @DIR_MACOS@components/appstartup.xpt
+  @DIR_MACOS@components/autocomplete.xpt
+  @DIR_MACOS@components/autoconfig.xpt
+  @DIR_MACOS@components/caps.xpt
+  @DIR_MACOS@components/chrome.xpt
+  @DIR_MACOS@components/commandhandler.xpt
+  @DIR_MACOS@components/commandlines.xpt
+  @DIR_MACOS@components/composer.xpt
+  @DIR_MACOS@components/content_base.xpt
+  @DIR_MACOS@components/content_html.xpt
+  @DIR_MACOS@components/content_htmldoc.xpt
+  @DIR_MACOS@components/content_xmldoc.xpt
+  @DIR_MACOS@components/content_xslt.xpt
+  @DIR_MACOS@components/content_xtf.xpt
+  @DIR_MACOS@components/contentprefs.xpt
+  @DIR_MACOS@components/cookie.xpt
+  @DIR_MACOS@components/docshell.xpt
+  @DIR_MACOS@components/dom.xpt
+  @DIR_MACOS@components/dom_base.xpt
+  @DIR_MACOS@components/dom_canvas.xpt
+  @DIR_MACOS@components/dom_core.xpt
+  @DIR_MACOS@components/dom_css.xpt
+  @DIR_MACOS@components/dom_events.xpt
+  @DIR_MACOS@components/dom_geolocation.xpt
+  @DIR_MACOS@components/dom_html.xpt
+  @DIR_MACOS@components/dom_json.xpt
+  @DIR_MACOS@components/dom_offline.xpt
+  @DIR_MACOS@components/dom_range.xpt
+  @DIR_MACOS@components/dom_sidebar.xpt
+  @DIR_MACOS@components/dom_smil.xpt
+  @DIR_MACOS@components/dom_storage.xpt
+  @DIR_MACOS@components/dom_stylesheets.xpt
+  @DIR_MACOS@components/dom_svg.xpt
+  @DIR_MACOS@components/dom_threads.xpt
+  @DIR_MACOS@components/dom_traversal.xpt
+  @DIR_MACOS@components/dom_views.xpt
+  @DIR_MACOS@components/dom_xbl.xpt
+  @DIR_MACOS@components/dom_xpath.xpt
+  @DIR_MACOS@components/dom_xul.xpt
+  @DIR_MACOS@components/downloads.xpt
+  @DIR_MACOS@components/editor.xpt
+  @DIR_MACOS@components/embed_base.xpt
+  @DIR_MACOS@components/extensions.xpt
+  @DIR_MACOS@components/exthandler.xpt
+  @DIR_MACOS@components/exthelper.xpt
+  @DIR_MACOS@components/fastfind.xpt
+  @DIR_MACOS@components/feeds.xpt
+  @DIR_MACOS@components/find.xpt
+  @DIR_MACOS@components/fts3tok.xpt
+  @DIR_MACOS@components/gfx.xpt
+  @DIR_MACOS@components/htmlparser.xpt
+  @DIR_MACOS@components/imgicon.xpt
+  @DIR_MACOS@components/imglib2.xpt
+  @DIR_MACOS@components/impComm4xMail.xpt
+  @DIR_MACOS@components/import.xpt
+  @DIR_MACOS@components/inspector.xpt
+  @DIR_MACOS@components/intl.xpt
+  @DIR_MACOS@components/jar.xpt
+  @DIR_MACOS@components/jsdservice.xpt
+  @DIR_MACOS@components/layout_base.xpt
+  @DIR_MACOS@components/layout_printing.xpt
+  @DIR_MACOS@components/layout_xul.xpt
+  @DIR_MACOS@components/layout_xul_tree.xpt
+  @DIR_MACOS@components/locale.xpt
+  @DIR_MACOS@components/loginmgr.xpt
+  @DIR_MACOS@components/lwbrk.xpt
+  @DIR_MACOS@components/mailprofilemigration.xpt
+  @DIR_MACOS@components/mailview.xpt
+  @DIR_MACOS@components/mime.xpt
+  @DIR_MACOS@components/mimetype.xpt
+  @DIR_MACOS@components/mozbrwsr.xpt
+  @DIR_MACOS@components/mozfind.xpt
+  @DIR_MACOS@components/mozldap.xpt
+  @DIR_MACOS@components/msgbase.xpt
+  @DIR_MACOS@components/msgcompose.xpt
+  @DIR_MACOS@components/msgdb.xpt
+  @DIR_MACOS@components/msgimap.xpt
+  @DIR_MACOS@components/msglocal.xpt
+  @DIR_MACOS@components/msgnews.xpt
+  @DIR_MACOS@components/msgsearch.xpt
+  @DIR_MACOS@components/msgsmime.xpt
+  @DIR_MACOS@components/necko.xpt
+  @DIR_MACOS@components/necko_about.xpt
+  @DIR_MACOS@components/necko_cache.xpt
+  @DIR_MACOS@components/necko_cookie.xpt
+  @DIR_MACOS@components/necko_dns.xpt
+  @DIR_MACOS@components/necko_file.xpt
+  @DIR_MACOS@components/necko_ftp.xpt
+  @DIR_MACOS@components/necko_http.xpt
+  @DIR_MACOS@components/necko_res.xpt
+  @DIR_MACOS@components/necko_socket.xpt
+  @DIR_MACOS@components/necko_strconv.xpt
+  @DIR_MACOS@components/necko_viewsource.xpt
+  @DIR_MACOS@components/necko_wifi.xpt
+  @DIR_MACOS@components/parentalcontrols.xpt
+  @DIR_MACOS@components/pipboot.xpt
+  @DIR_MACOS@components/pipnss.xpt
+  @DIR_MACOS@components/pippki.xpt
+  @DIR_MACOS@components/places.xpt
+  @DIR_MACOS@components/plugin.xpt
+  @DIR_MACOS@components/prefetch.xpt
+  @DIR_MACOS@components/pref.xpt
+  @DIR_MACOS@components/profile.xpt
+  @DIR_MACOS@components/proxyObjInst.xpt
+  @DIR_MACOS@components/rdf.xpt
+  @DIR_MACOS@components/satchel.xpt
+  @DIR_MACOS@components/saxparser.xpt
+  @DIR_MACOS@components/shellservice.xpt
+  @DIR_MACOS@components/shistory.xpt
+  @DIR_MACOS@components/spellchecker.xpt
+  @DIR_MACOS@components/steel.xpt
+  @DIR_MACOS@components/storage.xpt
+  @DIR_MACOS@components/toolkitprofile.xpt
+  @DIR_MACOS@components/txmgr.xpt
+  @DIR_MACOS@components/txtsvc.xpt
+  @DIR_MACOS@components/uconv.xpt
+  @DIR_MACOS@components/unicharutil.xpt
+  @DIR_MACOS@components/update.xpt
+  @DIR_MACOS@components/uriloader.xpt
+  @DIR_MACOS@components/url-classifier.xpt
+  @DIR_MACOS@components/urlformatter.xpt
+  @DIR_MACOS@components/webBrowser_core.xpt
+  @DIR_MACOS@components/webbrowserpersist.xpt
+  @DIR_MACOS@components/webshell_idls.xpt
+  @DIR_MACOS@components/widget.xpt
+  @DIR_MACOS@components/windowds.xpt
+  @DIR_MACOS@components/windowwatcher.xpt
+  @DIR_MACOS@components/xpautocomplete.xpt
+  @DIR_MACOS@components/xpcom_base.xpt
+  @DIR_MACOS@components/xpcom_components.xpt
+  @DIR_MACOS@components/xpcom_ds.xpt
+  @DIR_MACOS@components/xpcom_io.xpt
+  @DIR_MACOS@components/xpcom_system.xpt
+  @DIR_MACOS@components/xpcom_threads.xpt
+  @DIR_MACOS@components/xpcom_xpti.xpt
+  @DIR_MACOS@components/xpconnect.xpt
+  @DIR_MACOS@components/xpinstall.xpt
+  @DIR_MACOS@components/xulapp.xpt
+  @DIR_MACOS@components/xuldoc.xpt
+  @DIR_MACOS@components/xultmpl.xpt
+  @DIR_MACOS@components/zipwriter.xpt
   #ifdef XP_MACOSX
-    components/steel.xpt
-    components/necko_wifi.xpt
-    components/widget_cocoa.xpt
+    @DIR_MACOS@components/steel.xpt
+    @DIR_MACOS@components/necko_wifi.xpt
+    @DIR_MACOS@components/widget_cocoa.xpt
   #else
     components/accessibility.xpt
     components/filepicker.xpt
     components/toolkitremote.xpt
     components/websrvcs.xpt
   #endif
 #endif
 # ****************************************************************************
 # * End of XPTs at the time we started linking them on Linux and Mac.        *
 # ****************************************************************************
 #ifndef MOZ_MAINTENANCE_SERVICE
-maintenanceservice.exe
-maintenanceservice_installer.exe
+@DIR_MACOS@maintenanceservice.exe
+@DIR_MACOS@maintenanceservice_installer.exe
 #endif