Index: browser/installer/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/browser/installer/Makefile.in,v
retrieving revision 1.29
diff -u -8 -p -d -r1.29 Makefile.in
--- browser/installer/Makefile.in	3 Aug 2007 14:46:19 -0000	1.29
+++ browser/installer/Makefile.in	12 Sep 2007 19:13:20 -0000
@@ -78,20 +78,26 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
 MOZ_OPTIONAL_PKG_LIST = \
 	adt \
 	$(NULL)
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
+ifdef LIBXUL_SDK
+DEFINES += -DXRDIR=xulrunner/ -DLIBXUL_SDK
+else
+DEFINES += -DXRDIR=
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
-$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
+$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) Makefile Makefile.in
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_RSRC=branding/license.r
Index: browser/installer/windows/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/browser/installer/windows/Makefile.in,v
retrieving revision 1.43
diff -u -8 -p -d -r1.43 Makefile.in
--- browser/installer/windows/Makefile.in	20 Feb 2007 21:24:32 -0000	1.43
+++ browser/installer/windows/Makefile.in	12 Sep 2007 19:13:20 -0000
@@ -68,18 +68,25 @@ BRANDING_FILES = \
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
 	-DPKG_BASENAME=$(PKG_BASENAME) \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
 	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
+	-DPREF_DIR=$(PREF_DIR) \
 	$(NULL)
 
+ifdef LIBXUL_SDK
+DEFINES += -DXRDIR=xulrunner/ -DLIBXUL_SDK
+else
+DEFINES += -DXRDIR=
+endif
+
 include $(topsrcdir)/config/config.mk
 include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk
 
 installer::
 	$(MAKE) -C .. installer-stage
 	$(MAKE) $(CONFIG_DIR)/setup.exe
 
 # For building the uninstaller during the application build so it can be
Index: browser/installer/windows/packages-static
===================================================================
RCS file: /cvsroot/mozilla/browser/installer/windows/packages-static,v
retrieving revision 1.140
diff -u -8 -p -d -r1.140 packages-static
--- browser/installer/windows/packages-static	28 Aug 2007 13:37:47 -0000	1.140
+++ browser/installer/windows/packages-static	12 Sep 2007 19:13:20 -0000
@@ -10,350 +10,362 @@
 
 #filter substitution
 
 bin/.autoreg
 
 [@AB_CD@]
 bin\chrome\@AB_CD@.jar
 bin\chrome\@AB_CD@.manifest
-bin\defaults\pref\firefox-l10n.js
+#ifdef LIBXUL_SDK
+bin\xulrunner\chrome\@AB_CD@.jar
+bin\xulrunner\chrome\@AB_CD@.manifest
+#endif
+bin\@PREF_DIR@\firefox-l10n.js
 bin\defaults\existing-profile-defaults.js
 bin\browserconfig.properties
 bin\old-homepage-default.properties
 bin\searchplugins\*
 bin\defaults\profile\bookmarks.html
 bin\defaults\profile\localstore.rdf
 bin\defaults\profile\prefs.js
 bin\defaults\profile\mimeTypes.rdf
 bin\defaults\profile\chrome\*
 bin\uninstall\helper.exe
 bin\updater.ini
 bin\dictionaries\*
 
 [xpcom]
-bin\js3250.dll
-bin\plc4.dll
-bin\plds4.dll
-bin\xpcom.dll
-bin\xpcom_core.dll
-bin\xpistub.dll
-bin\nspr4.dll
-bin\xul.dll
-bin\components\xpinstal.dll
-bin\components\jar50.dll
-bin\Microsoft.VC80.CRT.manifest
-bin\msvcm80.dll
-bin\msvcp80.dll
-bin\msvcr80.dll
+bin\@XRDIR@js3250.dll
+bin\@XRDIR@plc4.dll
+bin\@XRDIR@plds4.dll
+bin\@XRDIR@xpcom.dll
+bin\@XRDIR@xpcom_core.dll
+bin\@XRDIR@xpistub.dll
+bin\@XRDIR@nspr4.dll
+bin\@XRDIR@xul.dll
+bin\@XRDIR@components\xpinstal.dll
+bin\@XRDIR@components\jar50.dll
+bin\@XRDIR@Microsoft.VC80.CRT.manifest
+bin\@XRDIR@msvcm80.dll
+bin\@XRDIR@msvcp80.dll
+bin\@XRDIR@msvcr80.dll
 
 [browser]
 ; [Base Browser Files]
 bin\@MOZ_APP_NAME@.exe
 bin\application.ini
-bin\platform.ini
-bin\plugins\npnul32.dll
-bin\res\cmessage.txt
-bin\res\effective_tld_names.dat
-bin\xpicleanup.exe
+bin\@XRDIR@platform.ini
+bin\@XRDIR@plugins\npnul32.dll
+bin\@XRDIR@res\cmessage.txt
+bin\@XRDIR@res\effective_tld_names.dat
+bin\@XRDIR@xpicleanup.exe
 bin\LICENSE
 bin\README.txt
-bin\sqlite3.dll
+bin\@XRDIR@sqlite3.dll
 
 ; [Components]
-bin\components\alerts.xpt
-bin\AccessibleMarshal.dll
-bin\components\accessibility.xpt
-bin\components\accessibility-msaa.xpt
-bin\components\appshell.xpt
-bin\components\appstartup.xpt
-bin\components\autocomplete.xpt
-bin\components\autoconfig.xpt
+bin\@XRDIR@components\alerts.xpt
+bin\@XRDIR@AccessibleMarshal.dll
+bin\@XRDIR@components\accessibility.xpt
+bin\@XRDIR@components\accessibility-msaa.xpt
+bin\@XRDIR@components\appshell.xpt
+bin\@XRDIR@components\appstartup.xpt
+bin\@XRDIR@components\autocomplete.xpt
+bin\@XRDIR@components\autoconfig.xpt
 bin\components\browsercompsbase.xpt
 bin\components\browserplaces.xpt
 bin\components\browsersearch.xpt
 bin\components\browser-feeds.xpt
-bin\components\caps.xpt
-bin\components\chardet.xpt
-bin\components\chrome.xpt
-bin\components\commandhandler.xpt
-bin\components\commandlines.xpt
-bin\components\composer.xpt
-bin\components\content_base.xpt
-bin\components\content_html.xpt
-bin\components\content_htmldoc.xpt
-bin\components\content_xmldoc.xpt
-bin\components\content_xslt.xpt
-bin\components\content_xtf.xpt
-bin\components\contentprefs.xpt
-bin\components\cookie.xpt
-bin\components\crashreporter.xpt
-bin\components\directory.xpt
-bin\components\docshell_base.xpt
-bin\components\dom.xpt
-bin\components\dom_base.xpt
-bin\components\dom_canvas.xpt
-bin\components\dom_core.xpt
-bin\components\dom_css.xpt
-bin\components\dom_events.xpt
-bin\components\dom_html.xpt
-bin\components\dom_offline.xpt
-bin\components\dom_range.xpt
-bin\components\dom_sidebar.xpt
-bin\components\dom_storage.xpt
-bin\components\dom_stylesheets.xpt
-bin\components\dom_traversal.xpt
-bin\components\dom_views.xpt
-bin\components\dom_xbl.xpt
-bin\components\dom_xpath.xpt
-bin\components\dom_xul.xpt
-bin\components\dom_loadsave.xpt
-bin\components\downloads.xpt
-bin\components\editor.xpt
-bin\components\embed_base.xpt
-bin\components\exthandler.xpt
-bin\components\fastfind.xpt
-bin\components\feeds.xpt
-bin\components\find.xpt
+bin\@XRDIR@components\caps.xpt
+bin\@XRDIR@components\chardet.xpt
+bin\@XRDIR@components\chrome.xpt
+bin\@XRDIR@components\commandhandler.xpt
+bin\@XRDIR@components\commandlines.xpt
+bin\@XRDIR@components\composer.xpt
+bin\@XRDIR@components\content_base.xpt
+bin\@XRDIR@components\content_html.xpt
+bin\@XRDIR@components\content_htmldoc.xpt
+bin\@XRDIR@components\content_xmldoc.xpt
+bin\@XRDIR@components\content_xslt.xpt
+bin\@XRDIR@components\content_xtf.xpt
+bin\@XRDIR@components\contentprefs.xpt
+bin\@XRDIR@components\cookie.xpt
+bin\@XRDIR@components\crashreporter.xpt
+bin\@XRDIR@components\directory.xpt
+bin\@XRDIR@components\docshell_base.xpt
+bin\@XRDIR@components\dom.xpt
+bin\@XRDIR@components\dom_base.xpt
+bin\@XRDIR@components\dom_canvas.xpt
+bin\@XRDIR@components\dom_core.xpt
+bin\@XRDIR@components\dom_css.xpt
+bin\@XRDIR@components\dom_events.xpt
+bin\@XRDIR@components\dom_html.xpt
+bin\@XRDIR@components\dom_offline.xpt
+bin\@XRDIR@components\dom_range.xpt
+bin\@XRDIR@components\dom_sidebar.xpt
+bin\@XRDIR@components\dom_storage.xpt
+bin\@XRDIR@components\dom_stylesheets.xpt
+bin\@XRDIR@components\dom_traversal.xpt
+bin\@XRDIR@components\dom_views.xpt
+bin\@XRDIR@components\dom_xbl.xpt
+bin\@XRDIR@components\dom_xpath.xpt
+bin\@XRDIR@components\dom_xul.xpt
+bin\@XRDIR@components\dom_loadsave.xpt
+bin\@XRDIR@components\downloads.xpt
+bin\@XRDIR@components\editor.xpt
+bin\@XRDIR@components\embed_base.xpt
+bin\@XRDIR@components\exthandler.xpt
+bin\@XRDIR@components\fastfind.xpt
+bin\@XRDIR@components\feeds.xpt
+bin\@XRDIR@components\find.xpt
 bin\components\fuel.xpt
-bin\components\gfx.xpt
-bin\components\htmlparser.xpt
-bin\components\imglib2.xpt
-bin\components\imgicon.xpt
-bin\components\intl.xpt
-bin\components\jar.xpt
-bin\components\jsconsole-clhandler.js
-bin\components\jsd3250.dll
-bin\components\jsdservice.xpt
-bin\components\layout_base.xpt
-bin\components\layout_printing.xpt
-bin\components\layout_xul.xpt
-bin\components\layout_xul_tree.xpt
-bin\components\inspector.xpt
-bin\components\locale.xpt
-bin\components\lwbrk.xpt
+bin\@XRDIR@components\gfx.xpt
+bin\@XRDIR@components\htmlparser.xpt
+bin\@XRDIR@components\imglib2.xpt
+bin\@XRDIR@components\imgicon.xpt
+bin\@XRDIR@components\intl.xpt
+bin\@XRDIR@components\jar.xpt
+bin\@XRDIR@components\jsconsole-clhandler.js
+bin\@XRDIR@components\jsd3250.dll
+bin\@XRDIR@components\jsdservice.xpt
+bin\@XRDIR@components\layout_base.xpt
+bin\@XRDIR@components\layout_printing.xpt
+bin\@XRDIR@components\layout_xul.xpt
+bin\@XRDIR@components\layout_xul_tree.xpt
+bin\@XRDIR@components\inspector.xpt
+bin\@XRDIR@components\locale.xpt
+bin\@XRDIR@components\lwbrk.xpt
 bin\components\microsummaries.xpt
 bin\components\migration.xpt
-bin\components\mimetype.xpt
-bin\components\mozbrwsr.xpt
-bin\components\mozfind.xpt
-bin\components\necko.xpt
-bin\components\necko_cache.xpt
-bin\components\necko_cookie.xpt
-bin\components\necko_strconv.xpt
-bin\components\necko_about.xpt
-bin\components\necko_dns.xpt
-bin\components\necko_file.xpt
-bin\components\necko_ftp.xpt
-bin\components\necko_http.xpt
-bin\components\necko_res.xpt
-bin\components\necko_socket.xpt
-bin\components\necko_viewsource.xpt
-bin\components\oji.xpt
-bin\components\loginmgr.xpt
-bin\components\places.xpt
-bin\components\plugin.xpt
-bin\components\pref.xpt
-bin\components\prefetch.xpt
-bin\components\profile.xpt
-bin\components\progressDlg.xpt
-bin\components\proxyObject.xpt
-bin\components\rdf.xpt
-bin\components\satchel.xpt
-bin\components\saxparser.xpt
-bin\components\shistory.xpt
-bin\components\signonviewer.xpt
-bin\components\storage.xpt
-bin\components\toolkitprofile.xpt
-bin\components\txtsvc.xpt
-bin\components\txmgr.xpt
-bin\components\ucnative.xpt
-bin\components\uconv.xpt
-bin\components\unicharutil.xpt
-bin\components\uriloader.xpt
-bin\components\wallet.xpt
-bin\components\walleteditor.xpt
-bin\components\walletpreview.xpt
-bin\components\webBrowser_core.xpt
-bin\components\webbrowserpersist.xpt
-bin\components\webshell_idls.xpt
-bin\components\websrvcs.xpt
-bin\components\widget.xpt
-bin\components\windowds.xpt
-bin\components\windowwatcher.xpt
-bin\components\shellservice.xpt
-bin\components\xml-rpc.xpt
-bin\components\xpcom_base.xpt
-bin\components\xpcom_system.xpt
-bin\components\xpcom_components.xpt
-bin\components\xpcom_ds.xpt
-bin\components\xpcom_io.xpt
-bin\components\xpcom_thread.xpt
-bin\components\xpcom_xpti.xpt
-bin\components\xpconnect.xpt
-bin\components\xpinstall.xpt
-bin\components\xulapp.xpt
-bin\components\xuldoc.xpt
-bin\components\xultmpl.xpt
+bin\@XRDIR@components\mimetype.xpt
+bin\@XRDIR@components\mozbrwsr.xpt
+bin\@XRDIR@components\mozfind.xpt
+bin\@XRDIR@components\necko.xpt
+bin\@XRDIR@components\necko_cache.xpt
+bin\@XRDIR@components\necko_cookie.xpt
+bin\@XRDIR@components\necko_strconv.xpt
+bin\@XRDIR@components\necko_about.xpt
+bin\@XRDIR@components\necko_dns.xpt
+bin\@XRDIR@components\necko_file.xpt
+bin\@XRDIR@components\necko_ftp.xpt
+bin\@XRDIR@components\necko_http.xpt
+bin\@XRDIR@components\necko_res.xpt
+bin\@XRDIR@components\necko_socket.xpt
+bin\@XRDIR@components\necko_viewsource.xpt
+bin\@XRDIR@components\oji.xpt
+bin\@XRDIR@components\loginmgr.xpt
+bin\@XRDIR@components\places.xpt
+bin\@XRDIR@components\plugin.xpt
+bin\@XRDIR@components\pref.xpt
+bin\@XRDIR@components\prefetch.xpt
+bin\@XRDIR@components\profile.xpt
+bin\@XRDIR@components\progressDlg.xpt
+bin\@XRDIR@components\proxyObject.xpt
+bin\@XRDIR@components\rdf.xpt
+bin\@XRDIR@components\satchel.xpt
+bin\@XRDIR@components\saxparser.xpt
+bin\@XRDIR@components\shistory.xpt
+bin\@XRDIR@components\signonviewer.xpt
+bin\@XRDIR@components\storage.xpt
+bin\@XRDIR@components\toolkitprofile.xpt
+bin\@XRDIR@components\txtsvc.xpt
+bin\@XRDIR@components\txmgr.xpt
+bin\@XRDIR@components\ucnative.xpt
+bin\@XRDIR@components\uconv.xpt
+bin\@XRDIR@components\unicharutil.xpt
+bin\@XRDIR@components\uriloader.xpt
+bin\@XRDIR@components\wallet.xpt
+bin\@XRDIR@components\walleteditor.xpt
+bin\@XRDIR@components\walletpreview.xpt
+bin\@XRDIR@components\webBrowser_core.xpt
+bin\@XRDIR@components\webbrowserpersist.xpt
+bin\@XRDIR@components\webshell_idls.xpt
+bin\@XRDIR@components\websrvcs.xpt
+bin\@XRDIR@components\widget.xpt
+bin\@XRDIR@components\windowds.xpt
+bin\@XRDIR@components\windowwatcher.xpt
+bin\@XRDIR@components\shellservice.xpt
+bin\@XRDIR@components\xml-rpc.xpt
+bin\@XRDIR@components\xpcom_base.xpt
+bin\@XRDIR@components\xpcom_system.xpt
+bin\@XRDIR@components\xpcom_components.xpt
+bin\@XRDIR@components\xpcom_ds.xpt
+bin\@XRDIR@components\xpcom_io.xpt
+bin\@XRDIR@components\xpcom_thread.xpt
+bin\@XRDIR@components\xpcom_xpti.xpt
+bin\@XRDIR@components\xpconnect.xpt
+bin\@XRDIR@components\xpinstall.xpt
+bin\@XRDIR@components\xulapp.xpt
+bin\@XRDIR@components\xuldoc.xpt
+bin\@XRDIR@components\xultmpl.xpt
 ; JavaScript components
-bin\components\FeedProcessor.js
+bin\@XRDIR@components\FeedProcessor.js
 bin\components\FeedConverter.js
 bin\components\FeedWriter.js
 bin\components\fuelApplication.js
 bin\components\WebContentConverter.js
 bin\components\nsBrowserContentHandler.js
 bin\components\nsBrowserGlue.js
 bin\components\nsSetDefaultBrowser.js
-bin\components\nsTryToClose.js
-bin\components\nsDictionary.js
-bin\components\nsHelperAppDlg.js
-bin\components\nsDownloadManagerUI.js
-bin\components\nsProxyAutoConfig.js
+bin\@XRDIR@components\nsTryToClose.js
+bin\@XRDIR@components\nsDictionary.js
+bin\@XRDIR@components\nsHelperAppDlg.js
+bin\@XRDIR@components\nsProxyAutoConfig.js
+bin\@XRDIR@components\nsDownloadManagerUI.js
 bin\components\nsSearchService.js
 bin\components\nsSearchSuggestions.js
 bin\components\nsSidebar.js
-bin\components\nsXmlRpcClient.js
-bin\components\nsExtensionManager.js
-bin\components\nsBlocklistService.js
-bin\components\nsUpdateService.js
+bin\@XRDIR@components\nsXmlRpcClient.js
+bin\@XRDIR@components\nsExtensionManager.js
+bin\@XRDIR@components\nsUpdateService.js
+bin\@XRDIR@components\nsBlocklistService.js
 bin\components\nsMicrosummaryService.js
 bin\components\nsPlacesTransactionsService.js
-bin\components\nsPostUpdateWin.js
-bin\components\nsLoginInfo.js
-bin\components\nsLoginManager.js
-bin\components\nsLoginManagerPrompter.js
-bin\components\storage-Legacy.js
-bin\components\pluginGlue.js
-bin\components\extensions.xpt
-bin\components\update.xpt
+bin\@XRDIR@components\nsPostUpdateWin.js
+bin\@XRDIR@components\nsLoginInfo.js
+bin\@XRDIR@components\nsLoginManager.js
+bin\@XRDIR@components\nsLoginManagerPrompter.js
+bin\@XRDIR@components\storage-Legacy.js
+bin\@XRDIR@components\pluginGlue.js
+bin\@XRDIR@components\extensions.xpt
+bin\@XRDIR@components\update.xpt
 bin\components\nsSessionStartup.js
 bin\components\nsSessionStore.js
 bin\components\sessionstore.xpt
-bin\components\nsURLFormatter.js
-bin\components\urlformatter.xpt
+bin\@XRDIR@components\nsURLFormatter.js
+bin\@XRDIR@components\urlformatter.xpt
 bin\components\browserdirprovider.dll
 bin\components\brwsrcmp.dll
-bin\components\txEXSLTRegExFunctions.js
-bin\components\nsLivemarkService.js
-bin\components\nsTaggingService.js
-bin\components\nsDefaultCLH.js
-bin\components\nsContentPrefService.js
-bin\components\nsContentDispatchChooser.js
-bin\components\nsHandlerService.js
-bin\components\nsScriptableIO.js
-bin\components\nsWebHandlerApp.js
+bin\@XRDIR@components\txEXSLTRegExFunctions.js
+bin\@XRDIR@components\nsLivemarkService.js
+bin\@XRDIR@components\nsTaggingService.js
+bin\@XRDIR@components\nsDefaultCLH.js
+bin\@XRDIR@components\nsContentPrefService.js
+bin\@XRDIR@components\nsContentDispatchChooser.js
+bin\@XRDIR@components\nsHandlerService.js
+bin\@XRDIR@components\nsScriptableIO.js
+bin\@XRDIR@components\nsWebHandlerApp.js
 
 ; Modules
 bin\modules\*
+#ifdef LIBXUL_SDK
+bin\xulrunner\modules\*
+#endif
 
 ; Safe Browsing
 bin\components\nsSafebrowsingApplication.js
 bin\components\safebrowsing.xpt
-bin\components\nsUrlClassifierListManager.js
-bin\components\nsUrlClassifierLib.js
-bin\components\url-classifier.xpt
+bin\@XRDIR@components\nsUrlClassifierListManager.js
+bin\@XRDIR@components\nsUrlClassifierLib.js
+bin\@XRDIR@components\nsUrlClassifierTable.js
+bin\@XRDIR@components\url-classifier.xpt
 
 ; [Browser Chrome Files]
 bin\chrome\browser.jar
 bin\chrome\browser.manifest
 bin\chrome\classic.jar
 bin\chrome\classic.manifest
+#ifdef LIBXUL_SDK
+bin\xulrunner\chrome\classic.jar
+bin\xulrunner\chrome\classic.manifest
+#endif
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
-bin\chrome\comm.jar
-bin\chrome\comm.manifest
-bin\chrome\toolkit.jar
-bin\chrome\toolkit.manifest
+bin\@XRDIR@chrome\comm.jar
+bin\@XRDIR@chrome\comm.manifest
+bin\@XRDIR@chrome\toolkit.jar
+bin\@XRDIR@chrome\toolkit.manifest
 bin\chrome\reporter.manifest
 bin\chrome\reporter.jar
-bin\defaults\pref\reporter.js
+bin\@PREF_DIR@\reporter.js
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
-bin\defaults\pref\firefox.js
-bin\defaults\pref\firefox-branding.js
-bin\defaults\pref\channel-prefs.js
-bin\greprefs\all.js
-bin\greprefs\security-prefs.js
-bin\greprefs\xpinstall.js
-bin\defaults\autoconfig\platform.js
-bin\defaults\autoconfig\prefcalls.js
+bin\@PREF_DIR@\firefox.js
+bin\@PREF_DIR@\firefox-branding.js
+bin\@PREF_DIR@\channel-prefs.js
+bin\@XRDIR@greprefs\all.js
+bin\@XRDIR@greprefs\security-prefs.js
+bin\@XRDIR@greprefs\xpinstall.js
+bin\@XRDIR@defaults\autoconfig\platform.js
+bin\@XRDIR@defaults\autoconfig\prefcalls.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 
-bin\res\hiddenWindow.html
-bin\res\ua.css
-bin\res\html.css
-bin\res\quirk.css
-bin\res\forms.css
-bin\res\EditorOverride.css
-bin\res\contenteditable.css
-bin\res\designmode.css
-bin\res\table-add-column-after-active.gif
-bin\res\table-add-column-after-hover.gif
-bin\res\table-add-column-after.gif
-bin\res\table-add-column-before-active.gif
-bin\res\table-add-column-before-hover.gif
-bin\res\table-add-column-before.gif
-bin\res\table-add-row-after-active.gif
-bin\res\table-add-row-after-hover.gif
-bin\res\table-add-row-after.gif
-bin\res\table-add-row-before-active.gif
-bin\res\table-add-row-before-hover.gif
-bin\res\table-add-row-before.gif
-bin\res\table-remove-column-active.gif
-bin\res\table-remove-column-hover.gif
-bin\res\table-remove-column.gif
-bin\res\table-remove-row-active.gif
-bin\res\table-remove-row-hover.gif
-bin\res\table-remove-row.gif
-bin\res\arrowd.gif
-bin\res\grabber.gif
-bin\res\viewsource.css
-bin\res\mathml.css
-bin\res\arrow.gif
-bin\res\loading-image.gif
-bin\res\broken-image.gif
-bin\res\fonts\*
-bin\res\dtd\*
-bin\res\html\*
-bin\res\wincharset.properties
-bin\res\charsetalias.properties
-bin\res\charsetData.properties
-bin\res\langGroups.properties
-bin\res\language.properties
-bin\res\entityTables\*
+bin\@XRDIR@res\hiddenWindow.html
+bin\@XRDIR@res\ua.css
+bin\@XRDIR@res\html.css
+bin\@XRDIR@res\quirk.css
+bin\@XRDIR@res\forms.css
+bin\@XRDIR@res\EditorOverride.css
+bin\@XRDIR@res\contenteditable.css
+bin\@XRDIR@res\designmode.css
+bin\@XRDIR@res\table-add-column-after-active.gif
+bin\@XRDIR@res\table-add-column-after-hover.gif
+bin\@XRDIR@res\table-add-column-after.gif
+bin\@XRDIR@res\table-add-column-before-active.gif
+bin\@XRDIR@res\table-add-column-before-hover.gif
+bin\@XRDIR@res\table-add-column-before.gif
+bin\@XRDIR@res\table-add-row-after-active.gif
+bin\@XRDIR@res\table-add-row-after-hover.gif
+bin\@XRDIR@res\table-add-row-after.gif
+bin\@XRDIR@res\table-add-row-before-active.gif
+bin\@XRDIR@res\table-add-row-before-hover.gif
+bin\@XRDIR@res\table-add-row-before.gif
+bin\@XRDIR@res\table-remove-column-active.gif
+bin\@XRDIR@res\table-remove-column-hover.gif
+bin\@XRDIR@res\table-remove-column.gif
+bin\@XRDIR@res\table-remove-row-active.gif
+bin\@XRDIR@res\table-remove-row-hover.gif
+bin\@XRDIR@res\table-remove-row.gif
+bin\@XRDIR@res\arrowd.gif
+bin\@XRDIR@res\grabber.gif
+bin\@XRDIR@res\viewsource.css
+bin\@XRDIR@res\mathml.css
+bin\@XRDIR@res\arrow.gif
+bin\@XRDIR@res\loading-image.gif
+bin\@XRDIR@res\broken-image.gif
+bin\@XRDIR@res\fonts\*
+bin\@XRDIR@res\dtd\*
+bin\@XRDIR@res\html\*
+bin\@XRDIR@res\wincharset.properties
+bin\@XRDIR@res\charsetalias.properties
+bin\@XRDIR@res\charsetData.properties
+bin\@XRDIR@res\langGroups.properties
+bin\@XRDIR@res\language.properties
+bin\@XRDIR@res\entityTables\*
 
 ; svg
-bin\res\svg.css
-bin\components\dom_svg.xpt
+bin\@XRDIR@res\svg.css
+bin\@XRDIR@components\dom_svg.xpt
 
 ; [Personal Security Manager]
 ;
-bin\nssckbi.dll
-bin\components\pipboot.xpt
-bin\components\pipnss.xpt
-bin\components\pippki.xpt
-bin\nss3.dll
-bin\smime3.dll
-bin\softokn3.chk
-bin\softokn3.dll
-bin\freebl3.chk
-bin\freebl3.dll
-bin\ssl3.dll
-bin\nssdbm3.dll
-bin\chrome\pippki.jar
-bin\chrome\pippki.manifest
+bin\@XRDIR@nssckbi.dll
+bin\@XRDIR@components\pipboot.xpt
+bin\@XRDIR@components\pipnss.xpt
+bin\@XRDIR@components\pippki.xpt
+bin\@XRDIR@nss3.dll
+bin\@XRDIR@smime3.dll
+bin\@XRDIR@softokn3.chk
+bin\@XRDIR@softokn3.dll
+bin\@XRDIR@freebl3.chk
+bin\@XRDIR@freebl3.dll
+bin\@XRDIR@ssl3.dll
+bin\@XRDIR@nssdbm3.dll
+bin\@XRDIR@chrome\pippki.jar
+bin\@XRDIR@chrome\pippki.manifest
 
 ; [Updater]
 ;
-bin\updater.exe
+bin\@XRDIR@updater.exe
 
 ; [Crash Reporter]
-bin\crashreporter.exe
-bin\crashreporter.ini
+bin\@XRDIR@crashreporter.exe
+bin\@XRDIR@crashreporter.ini
 
 ; [Additional Developer Tools]
 [adt]
 bin\extensions\inspector@mozilla.org\install.rdf
 bin\extensions\inspector@mozilla.org\components\inspector-cmdline.js
 bin\extensions\inspector@mozilla.org\chrome.manifest
 bin\extensions\inspector@mozilla.org\chrome\inspector.jar
 bin\extensions\inspector@mozilla.org\defaults\preferences\inspector.js