Drop %_EXT% which was always empty

1 files changed, 253 insertions, 253 deletions

diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index 67bd28bb164b..1835ea726158 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -1,257 +1,257 @@
-mkdir: %_DEST%\inc%_EXT%\mozilla
-mkdir: %COMMON_DEST%\inc%_EXT%\mozilla
-mkdir: %_DEST%\inc%_EXT%\mozilla\absync
-mkdir: %_DEST%\inc%_EXT%\mozilla\accessibility
-mkdir: %_DEST%\inc%_EXT%\mozilla\AcctIdl
-mkdir: %_DEST%\inc%_EXT%\mozilla\addrbook
-mkdir: %_DEST%\inc%_EXT%\mozilla\appcomps
-mkdir: %_DEST%\inc%_EXT%\mozilla\appshell
-mkdir: %_DEST%\inc%_EXT%\mozilla\appstartup
-mkdir: %_DEST%\inc%_EXT%\mozilla\bookmarks
-mkdir: %_DEST%\inc%_EXT%\mozilla\caps
-mkdir: %_DEST%\inc%_EXT%\mozilla\chardet
-mkdir: %_DEST%\inc%_EXT%\mozilla\chrome
-mkdir: %_DEST%\inc%_EXT%\mozilla\content
-mkdir: %_DEST%\inc%_EXT%\mozilla\content_xsl
-mkdir: %_DEST%\inc%_EXT%\mozilla\content_xul
-mkdir: %_DEST%\inc%_EXT%\mozilla\cookie
-mkdir: %_DEST%\inc%_EXT%\mozilla\docshell
-mkdir: %_DEST%\inc%_EXT%\mozilla\dom
-mkdir: %_DEST%\inc%_EXT%\mozilla\editor
-mkdir: %_DEST%\inc%_EXT%\mozilla\embed_base
-mkdir: %_DEST%\inc%_EXT%\mozilla\expat
-mkdir: %_DEST%\inc%_EXT%\mozilla\exthandler
-mkdir: %_DEST%\inc%_EXT%\mozilla\find
-mkdir: %_DEST%\inc%_EXT%\mozilla\gfx
-mkdir: %_DEST%\inc%_EXT%\mozilla\gfx2
-mkdir: %_DEST%\inc%_EXT%\mozilla\gfxwin
-mkdir: %_DEST%\inc%_EXT%\mozilla\gkplugin
-mkdir: %_DEST%\inc%_EXT%\mozilla\helperAppDlg
-mkdir: %_DEST%\inc%_EXT%\mozilla\history
-mkdir: %_DEST%\inc%_EXT%\mozilla\htmlparser
-mkdir: %_DEST%\inc%_EXT%\mozilla\imgicon
-mkdir: %_DEST%\inc%_EXT%\mozilla\imglib2
-mkdir: %_DEST%\inc%_EXT%\mozilla\import
-mkdir: %_DEST%\inc%_EXT%\mozilla\intl
-mkdir: %_DEST%\inc%_EXT%\mozilla\intlcmpt
-mkdir: %_DEST%\inc%_EXT%\mozilla\jar
-mkdir: %_DEST%\inc%_EXT%\mozilla\java
-mkdir: %_DEST%\inc%_EXT%\mozilla\jpeg
-mkdir: %_DEST%\inc%_EXT%\mozilla\js
-mkdir: %_DEST%\inc%_EXT%\mozilla\jsconsole
-mkdir: %_DEST%\inc%_EXT%\mozilla\jsurl
-mkdir: %_DEST%\inc%_EXT%\mozilla\layout
-mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul
-mkdir: %_DEST%\inc%_EXT%\mozilla\ldap
-mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr
-mkdir: %_DEST%\inc%_EXT%\mozilla\locale
-mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk
-mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews
-mkdir: %_DEST%\inc%_EXT%\mozilla\mime
-mkdir: %_DEST%\inc%_EXT%\mozilla\mimeemitter
-mkdir: %_DEST%\inc%_EXT%\mozilla\mimetype
-mkdir: %_DEST%\inc%_EXT%\mozilla\mng
-mkdir: %_DEST%\inc%_EXT%\mozilla\mork
-mkdir: %_DEST%\inc%_EXT%\mozilla\mozbrwsr
-mkdir: %_DEST%\inc%_EXT%\mozilla\mozldap
-mkdir: %_DEST%\inc%_EXT%\mozilla\mozreg
-mkdir: %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgbase
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgbaseutil
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgcompo
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgdb
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgimap
-mkdir: %_DEST%\inc%_EXT%\mozilla\msglocal
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgnews
-mkdir: %_DEST%\inc%_EXT%\mozilla\msgsearch
-mkdir: %_DEST%\inc%_EXT%\mozilla\necko
-mkdir: %_DEST%\inc%_EXT%\mozilla\necko2
-mkdir: %_DEST%\inc%_EXT%\mozilla\nkcache
-mkdir: %_DEST%\inc%_EXT%\mozilla\nspr
-mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete
-mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private
-mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm
-mkdir: %_DEST%\inc%_EXT%\mozilla\nss
-mkdir: %_DEST%\inc%_EXT%\mozilla\oji
-mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete
-mkdir: %_DEST%\inc%_EXT%\mozilla\plugin
-mkdir: %_DEST%\inc%_EXT%\mozilla\png
-mkdir: %_DEST%\inc%_EXT%\mozilla\pref
-mkdir: %_DEST%\inc%_EXT%\mozilla\prefmigr
-mkdir: %_DEST%\inc%_EXT%\mozilla\profile
-mkdir: %_DEST%\inc%_EXT%\mozilla\rdf
-mkdir: %_DEST%\inc%_EXT%\mozilla\rdfutil
-mkdir: %_DEST%\inc%_EXT%\mozilla\regviewer
-mkdir: %_DEST%\inc%_EXT%\mozilla\related
-mkdir: %_DEST%\inc%_EXT%\mozilla\search
-mkdir: %_DEST%\inc%_EXT%\mozilla\setuprsc
-mkdir: %_DEST%\inc%_EXT%\mozilla\shistory
-mkdir: %_DEST%\inc%_EXT%\mozilla\sidebar
-mkdir: %_DEST%\inc%_EXT%\mozilla\signonviewer
-mkdir: %_DEST%\inc%_EXT%\mozilla\string
-mkdir: %_DEST%\inc%_EXT%\mozilla\timer
-mkdir: %_DEST%\inc%_EXT%\mozilla\transformiix
-mkdir: %_DEST%\inc%_EXT%\mozilla\txmgr
-mkdir: %_DEST%\inc%_EXT%\mozilla\txtsvc
-mkdir: %_DEST%\inc%_EXT%\mozilla\uconv
-mkdir: %_DEST%\inc%_EXT%\mozilla\unicharutil
-mkdir: %_DEST%\inc%_EXT%\mozilla\uninstall
-mkdir: %_DEST%\inc%_EXT%\mozilla\uriloader
-mkdir: %_DEST%\inc%_EXT%\mozilla\urlbarhistory
-mkdir: %_DEST%\inc%_EXT%\mozilla\util
-mkdir: %_DEST%\inc%_EXT%\mozilla\view
-mkdir: %_DEST%\inc%_EXT%\mozilla\wallet
-mkdir: %_DEST%\inc%_EXT%\mozilla\walleteditor
-mkdir: %_DEST%\inc%_EXT%\mozilla\walletpreview
-mkdir: %_DEST%\inc%_EXT%\mozilla\webBrowser_core
-mkdir: %_DEST%\inc%_EXT%\mozilla\webshell
-mkdir: %_DEST%\inc%_EXT%\mozilla\widget
-mkdir: %_DEST%\inc%_EXT%\mozilla\windowwatcher
-mkdir: %_DEST%\inc%_EXT%\mozilla\xml-rpc
-mkdir: %_DEST%\inc%_EXT%\mozilla\xmlextras
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpconnect
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpicleanup
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpinstall
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpnet
-mkdir: %_DEST%\inc%_EXT%\mozilla\zlib
-mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
+mkdir: %_DEST%\inc\mozilla
+mkdir: %COMMON_DEST%\inc\mozilla
+mkdir: %_DEST%\inc\mozilla\absync
+mkdir: %_DEST%\inc\mozilla\accessibility
+mkdir: %_DEST%\inc\mozilla\AcctIdl
+mkdir: %_DEST%\inc\mozilla\addrbook
+mkdir: %_DEST%\inc\mozilla\appcomps
+mkdir: %_DEST%\inc\mozilla\appshell
+mkdir: %_DEST%\inc\mozilla\appstartup
+mkdir: %_DEST%\inc\mozilla\bookmarks
+mkdir: %_DEST%\inc\mozilla\caps
+mkdir: %_DEST%\inc\mozilla\chardet
+mkdir: %_DEST%\inc\mozilla\chrome
+mkdir: %_DEST%\inc\mozilla\content
+mkdir: %_DEST%\inc\mozilla\content_xsl
+mkdir: %_DEST%\inc\mozilla\content_xul
+mkdir: %_DEST%\inc\mozilla\cookie
+mkdir: %_DEST%\inc\mozilla\docshell
+mkdir: %_DEST%\inc\mozilla\dom
+mkdir: %_DEST%\inc\mozilla\editor
+mkdir: %_DEST%\inc\mozilla\embed_base
+mkdir: %_DEST%\inc\mozilla\expat
+mkdir: %_DEST%\inc\mozilla\exthandler
+mkdir: %_DEST%\inc\mozilla\find
+mkdir: %_DEST%\inc\mozilla\gfx
+mkdir: %_DEST%\inc\mozilla\gfx2
+mkdir: %_DEST%\inc\mozilla\gfxwin
+mkdir: %_DEST%\inc\mozilla\gkplugin
+mkdir: %_DEST%\inc\mozilla\helperAppDlg
+mkdir: %_DEST%\inc\mozilla\history
+mkdir: %_DEST%\inc\mozilla\htmlparser
+mkdir: %_DEST%\inc\mozilla\imgicon
+mkdir: %_DEST%\inc\mozilla\imglib2
+mkdir: %_DEST%\inc\mozilla\import
+mkdir: %_DEST%\inc\mozilla\intl
+mkdir: %_DEST%\inc\mozilla\intlcmpt
+mkdir: %_DEST%\inc\mozilla\jar
+mkdir: %_DEST%\inc\mozilla\java
+mkdir: %_DEST%\inc\mozilla\jpeg
+mkdir: %_DEST%\inc\mozilla\js
+mkdir: %_DEST%\inc\mozilla\jsconsole
+mkdir: %_DEST%\inc\mozilla\jsurl
+mkdir: %_DEST%\inc\mozilla\layout
+mkdir: %_DEST%\inc\mozilla\layout_xul
+mkdir: %_DEST%\inc\mozilla\ldap
+mkdir: %_DEST%\inc\mozilla\ldap\ldap
+mkdir: %_DEST%\inc\mozilla\ldap-nspr
+mkdir: %_DEST%\inc\mozilla\locale
+mkdir: %_DEST%\inc\mozilla\lwbrk
+mkdir: %_DEST%\inc\mozilla\mailnews
+mkdir: %_DEST%\inc\mozilla\mime
+mkdir: %_DEST%\inc\mozilla\mimeemitter
+mkdir: %_DEST%\inc\mozilla\mimetype
+mkdir: %_DEST%\inc\mozilla\mng
+mkdir: %_DEST%\inc\mozilla\mork
+mkdir: %_DEST%\inc\mozilla\mozbrwsr
+mkdir: %_DEST%\inc\mozilla\mozldap
+mkdir: %_DEST%\inc\mozilla\mozreg
+mkdir: %_DEST%\inc\mozilla\mpfilelocprovider
+mkdir: %_DEST%\inc\mozilla\msgbase
+mkdir: %_DEST%\inc\mozilla\msgbaseutil
+mkdir: %_DEST%\inc\mozilla\msgcompo
+mkdir: %_DEST%\inc\mozilla\msgdb
+mkdir: %_DEST%\inc\mozilla\msgimap
+mkdir: %_DEST%\inc\mozilla\msglocal
+mkdir: %_DEST%\inc\mozilla\msgnews
+mkdir: %_DEST%\inc\mozilla\msgsearch
+mkdir: %_DEST%\inc\mozilla\necko
+mkdir: %_DEST%\inc\mozilla\necko2
+mkdir: %_DEST%\inc\mozilla\nkcache
+mkdir: %_DEST%\inc\mozilla\nspr
+mkdir: %_DEST%\inc\mozilla\nspr\obsolete
+mkdir: %_DEST%\inc\mozilla\nspr\private
+mkdir: %_DEST%\inc\mozilla\nsprefm
+mkdir: %_DEST%\inc\mozilla\nss
+mkdir: %_DEST%\inc\mozilla\oji
+mkdir: %_DEST%\inc\mozilla\obsolete
+mkdir: %_DEST%\inc\mozilla\plugin
+mkdir: %_DEST%\inc\mozilla\png
+mkdir: %_DEST%\inc\mozilla\pref
+mkdir: %_DEST%\inc\mozilla\prefmigr
+mkdir: %_DEST%\inc\mozilla\profile
+mkdir: %_DEST%\inc\mozilla\rdf
+mkdir: %_DEST%\inc\mozilla\rdfutil
+mkdir: %_DEST%\inc\mozilla\regviewer
+mkdir: %_DEST%\inc\mozilla\related
+mkdir: %_DEST%\inc\mozilla\search
+mkdir: %_DEST%\inc\mozilla\setuprsc
+mkdir: %_DEST%\inc\mozilla\shistory
+mkdir: %_DEST%\inc\mozilla\sidebar
+mkdir: %_DEST%\inc\mozilla\signonviewer
+mkdir: %_DEST%\inc\mozilla\string
+mkdir: %_DEST%\inc\mozilla\timer
+mkdir: %_DEST%\inc\mozilla\transformiix
+mkdir: %_DEST%\inc\mozilla\txmgr
+mkdir: %_DEST%\inc\mozilla\txtsvc
+mkdir: %_DEST%\inc\mozilla\uconv
+mkdir: %_DEST%\inc\mozilla\unicharutil
+mkdir: %_DEST%\inc\mozilla\uninstall
+mkdir: %_DEST%\inc\mozilla\uriloader
+mkdir: %_DEST%\inc\mozilla\urlbarhistory
+mkdir: %_DEST%\inc\mozilla\util
+mkdir: %_DEST%\inc\mozilla\view
+mkdir: %_DEST%\inc\mozilla\wallet
+mkdir: %_DEST%\inc\mozilla\walleteditor
+mkdir: %_DEST%\inc\mozilla\walletpreview
+mkdir: %_DEST%\inc\mozilla\webBrowser_core
+mkdir: %_DEST%\inc\mozilla\webshell
+mkdir: %_DEST%\inc\mozilla\widget
+mkdir: %_DEST%\inc\mozilla\windowwatcher
+mkdir: %_DEST%\inc\mozilla\xml-rpc
+mkdir: %_DEST%\inc\mozilla\xmlextras
+mkdir: %_DEST%\inc\mozilla\xpcom
+mkdir: %_DEST%\inc\mozilla\xpconnect
+mkdir: %_DEST%\inc\mozilla\xpicleanup
+mkdir: %_DEST%\inc\mozilla\xpinstall
+mkdir: %_DEST%\inc\mozilla\xpnet
+mkdir: %_DEST%\inc\mozilla\zlib
+mkdir: %_DEST%\inc\mozilla\xpcom_obsolete
 
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mozilla
-..\%__SRC%\inc\absync\* %_DEST%\inc%_EXT%\mozilla\absync
-..\%__SRC%\inc\accessibility\* %_DEST%\inc%_EXT%\mozilla\accessibility
-..\%__SRC%\inc\AcctIdl\* %_DEST%\inc%_EXT%\mozilla\AcctIdl
-..\%__SRC%\inc\addrbook\* %_DEST%\inc%_EXT%\mozilla\addrbook
-..\%__SRC%\inc\appcomps\* %_DEST%\inc%_EXT%\mozilla\appcomps
-..\%__SRC%\inc\appshell\* %_DEST%\inc%_EXT%\mozilla\appshell
-..\%__SRC%\inc\appstartup\* %_DEST%\inc%_EXT%\mozilla\appstartup
-..\%__SRC%\inc\bookmarks\* %_DEST%\inc%_EXT%\mozilla\bookmarks
-..\%__SRC%\inc\caps\* %_DEST%\inc%_EXT%\mozilla\caps
-..\%__SRC%\inc\chardet\* %_DEST%\inc%_EXT%\mozilla\chardet
-..\%__SRC%\inc\chrome\* %_DEST%\inc%_EXT%\mozilla\chrome
-..\%__SRC%\inc\content\* %_DEST%\inc%_EXT%\mozilla\content
-..\%__SRC%\inc\content_xsl\* %_DEST%\inc%_EXT%\mozilla\content_xsl
-..\%__SRC%\inc\content_xul\* %_DEST%\inc%_EXT%\mozilla\content_xul
-..\%__SRC%\inc\cookie\* %_DEST%\inc%_EXT%\mozilla\cookie
-..\%__SRC%\inc\docshell\* %_DEST%\inc%_EXT%\mozilla\docshell
-..\%__SRC%\inc\dom\* %_DEST%\inc%_EXT%\mozilla\dom
-..\%__SRC%\inc\editor\* %_DEST%\inc%_EXT%\mozilla\editor
-..\%__SRC%\inc\embed_base\* %_DEST%\inc%_EXT%\mozilla\embed_base
-..\%__SRC%\inc\expat\* %_DEST%\inc%_EXT%\mozilla\expat
-..\%__SRC%\inc\exthandler\* %_DEST%\inc%_EXT%\mozilla\exthandler
-..\%__SRC%\inc\find\* %_DEST%\inc%_EXT%\mozilla\find
-..\%__SRC%\inc\gfx\* %_DEST%\inc%_EXT%\mozilla\gfx
-..\%__SRC%\inc\gfx2\* %_DEST%\inc%_EXT%\mozilla\gfx2
-..\%__SRC%\inc\gfxwin\* %_DEST%\inc%_EXT%\mozilla\gfxwin
-..\%__SRC%\inc\gkplugin\* %_DEST%\inc%_EXT%\mozilla\gkplugin
-..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc%_EXT%\mozilla\helperAppDlg
-..\%__SRC%\inc\history\* %_DEST%\inc%_EXT%\mozilla\history
-..\%__SRC%\inc\htmlparser\* %_DEST%\inc%_EXT%\mozilla\htmlparser
-..\%__SRC%\inc\imgicon\* %_DEST%\inc%_EXT%\mozilla\imgicon
-..\%__SRC%\inc\imglib2\* %_DEST%\inc%_EXT%\mozilla\imglib2
-..\%__SRC%\inc\import\* %_DEST%\inc%_EXT%\mozilla\import
-..\%__SRC%\inc\intl\* %_DEST%\inc%_EXT%\mozilla\intl
-..\%__SRC%\inc\intlcmpt\* %_DEST%\inc%_EXT%\mozilla\intlcmpt
-..\%__SRC%\inc\jar\* %_DEST%\inc%_EXT%\mozilla\jar
-..\%__SRC%\inc\java\* %_DEST%\inc%_EXT%\mozilla\java
-..\%__SRC%\inc\jpeg\* %_DEST%\inc%_EXT%\mozilla\jpeg
-..\%__SRC%\inc\js\* %_DEST%\inc%_EXT%\mozilla\js
-..\%__SRC%\inc\jsconsole\* %_DEST%\inc%_EXT%\mozilla\jsconsole
-..\%__SRC%\inc\jsurl\* %_DEST%\inc%_EXT%\mozilla\jsurl
-..\%__SRC%\inc\layout\* %_DEST%\inc%_EXT%\mozilla\layout
-..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul
-..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap
-..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap
-..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr
-..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale
-..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk
-..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews
-..\%__SRC%\inc\mime\* %_DEST%\inc%_EXT%\mozilla\mime
-..\%__SRC%\inc\mimeemitter\* %_DEST%\inc%_EXT%\mozilla\mimeemitter
-..\%__SRC%\inc\mimetype\* %_DEST%\inc%_EXT%\mozilla\mimetype
-..\%__SRC%\inc\mng\* %_DEST%\inc%_EXT%\mozilla\mng
-..\%__SRC%\inc\mork\* %_DEST%\inc%_EXT%\mozilla\mork
-..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc%_EXT%\mozilla\mozbrwsr
-..\%__SRC%\inc\mozldap\* %_DEST%\inc%_EXT%\mozilla\mozldap
-..\%__SRC%\inc\mozreg\* %_DEST%\inc%_EXT%\mozilla\mozreg
-..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider
-..\%__SRC%\inc\msgbase\* %_DEST%\inc%_EXT%\mozilla\msgbase
-..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc%_EXT%\mozilla\msgbaseutil
-..\%__SRC%\inc\msgcompo\* %_DEST%\inc%_EXT%\mozilla\msgcompo
-..\%__SRC%\inc\msgdb\* %_DEST%\inc%_EXT%\mozilla\msgdb
-..\%__SRC%\inc\msgimap\* %_DEST%\inc%_EXT%\mozilla\msgimap
-..\%__SRC%\inc\msglocal\* %_DEST%\inc%_EXT%\mozilla\msglocal
-..\%__SRC%\inc\msgnews\* %_DEST%\inc%_EXT%\mozilla\msgnews
-..\%__SRC%\inc\msgsearch\* %_DEST%\inc%_EXT%\mozilla\msgsearch
-..\%__SRC%\inc\necko\* %_DEST%\inc%_EXT%\mozilla\necko
-..\%__SRC%\inc\necko2\* %_DEST%\inc%_EXT%\mozilla\necko2
-..\%__SRC%\inc\nkcache\* %_DEST%\inc%_EXT%\mozilla\nkcache
-..\%__SRC%\inc\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr
-..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete
-..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private
-..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm
-..\%__SRC%\inc\nss\* %_DEST%\inc%_EXT%\mozilla\nss
-..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji
-..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete
-..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin
-..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png
-..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref
-..\%__SRC%\inc\prefmigr\* %_DEST%\inc%_EXT%\mozilla\prefmigr
-..\%__SRC%\inc\profile\* %_DEST%\inc%_EXT%\mozilla\profile
-..\%__SRC%\inc\rdf\* %_DEST%\inc%_EXT%\mozilla\rdf
-..\%__SRC%\inc\rdfutil\* %_DEST%\inc%_EXT%\mozilla\rdfutil
-..\%__SRC%\inc\regviewer\* %_DEST%\inc%_EXT%\mozilla\regviewer
-..\%__SRC%\inc\related\* %_DEST%\inc%_EXT%\mozilla\related
-..\%__SRC%\inc\search\* %_DEST%\inc%_EXT%\mozilla\search
-..\%__SRC%\inc\setuprsc\* %_DEST%\inc%_EXT%\mozilla\setuprsc
-..\%__SRC%\inc\shistory\* %_DEST%\inc%_EXT%\mozilla\shistory
-..\%__SRC%\inc\sidebar\* %_DEST%\inc%_EXT%\mozilla\sidebar
-..\%__SRC%\inc\signonviewer\* %_DEST%\inc%_EXT%\mozilla\signonviewer
-..\%__SRC%\inc\string\* %_DEST%\inc%_EXT%\mozilla\string
-..\%__SRC%\inc\timer\* %_DEST%\inc%_EXT%\mozilla\timer
-..\%__SRC%\inc\transformiix\* %_DEST%\inc%_EXT%\mozilla\transformiix
-..\%__SRC%\inc\txmgr\* %_DEST%\inc%_EXT%\mozilla\txmgr
-..\%__SRC%\inc\txtsvc\* %_DEST%\inc%_EXT%\mozilla\txtsvc
-..\%__SRC%\inc\uconv\* %_DEST%\inc%_EXT%\mozilla\uconv
-..\%__SRC%\inc\unicharutil\* %_DEST%\inc%_EXT%\mozilla\unicharutil
-..\%__SRC%\inc\uninstall\* %_DEST%\inc%_EXT%\mozilla\uninstall
-..\%__SRC%\inc\uriloader\* %_DEST%\inc%_EXT%\mozilla\uriloader
-..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc%_EXT%\mozilla\urlbarhistory
-..\%__SRC%\inc\util\* %_DEST%\inc%_EXT%\mozilla\util
-..\%__SRC%\inc\view\* %_DEST%\inc%_EXT%\mozilla\view
-..\%__SRC%\inc\wallet\* %_DEST%\inc%_EXT%\mozilla\wallet
-..\%__SRC%\inc\walleteditor\* %_DEST%\inc%_EXT%\mozilla\walleteditor
-..\%__SRC%\inc\walletpreview\* %_DEST%\inc%_EXT%\mozilla\walletpreview
-..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc%_EXT%\mozilla\webBrowser_core
-..\%__SRC%\inc\webshell\* %_DEST%\inc%_EXT%\mozilla\webshell
-..\%__SRC%\inc\widget\* %_DEST%\inc%_EXT%\mozilla\widget
-..\%__SRC%\inc\windowwatcher\* %_DEST%\inc%_EXT%\mozilla\windowwatcher
-..\%__SRC%\inc\xml-rpc\* %_DEST%\inc%_EXT%\mozilla\xml-rpc
-..\%__SRC%\inc\xmlextras\* %_DEST%\inc%_EXT%\mozilla\xmlextras
-..\%__SRC%\inc\xpcom\* %_DEST%\inc%_EXT%\mozilla\xpcom
-..\%__SRC%\inc\xpconnect\* %_DEST%\inc%_EXT%\mozilla\xpconnect
-..\%__SRC%\inc\xpicleanup\* %_DEST%\inc%_EXT%\mozilla\xpicleanup
-..\%__SRC%\inc\xpinstall\* %_DEST%\inc%_EXT%\mozilla\xpinstall
-..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet
-..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib
-..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
+..\%__SRC%\inc\*.h %_DEST%\inc\mozilla
+..\%__SRC%\inc\absync\* %_DEST%\inc\mozilla\absync
+..\%__SRC%\inc\accessibility\* %_DEST%\inc\mozilla\accessibility
+..\%__SRC%\inc\AcctIdl\* %_DEST%\inc\mozilla\AcctIdl
+..\%__SRC%\inc\addrbook\* %_DEST%\inc\mozilla\addrbook
+..\%__SRC%\inc\appcomps\* %_DEST%\inc\mozilla\appcomps
+..\%__SRC%\inc\appshell\* %_DEST%\inc\mozilla\appshell
+..\%__SRC%\inc\appstartup\* %_DEST%\inc\mozilla\appstartup
+..\%__SRC%\inc\bookmarks\* %_DEST%\inc\mozilla\bookmarks
+..\%__SRC%\inc\caps\* %_DEST%\inc\mozilla\caps
+..\%__SRC%\inc\chardet\* %_DEST%\inc\mozilla\chardet
+..\%__SRC%\inc\chrome\* %_DEST%\inc\mozilla\chrome
+..\%__SRC%\inc\content\* %_DEST%\inc\mozilla\content
+..\%__SRC%\inc\content_xsl\* %_DEST%\inc\mozilla\content_xsl
+..\%__SRC%\inc\content_xul\* %_DEST%\inc\mozilla\content_xul
+..\%__SRC%\inc\cookie\* %_DEST%\inc\mozilla\cookie
+..\%__SRC%\inc\docshell\* %_DEST%\inc\mozilla\docshell
+..\%__SRC%\inc\dom\* %_DEST%\inc\mozilla\dom
+..\%__SRC%\inc\editor\* %_DEST%\inc\mozilla\editor
+..\%__SRC%\inc\embed_base\* %_DEST%\inc\mozilla\embed_base
+..\%__SRC%\inc\expat\* %_DEST%\inc\mozilla\expat
+..\%__SRC%\inc\exthandler\* %_DEST%\inc\mozilla\exthandler
+..\%__SRC%\inc\find\* %_DEST%\inc\mozilla\find
+..\%__SRC%\inc\gfx\* %_DEST%\inc\mozilla\gfx
+..\%__SRC%\inc\gfx2\* %_DEST%\inc\mozilla\gfx2
+..\%__SRC%\inc\gfxwin\* %_DEST%\inc\mozilla\gfxwin
+..\%__SRC%\inc\gkplugin\* %_DEST%\inc\mozilla\gkplugin
+..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc\mozilla\helperAppDlg
+..\%__SRC%\inc\history\* %_DEST%\inc\mozilla\history
+..\%__SRC%\inc\htmlparser\* %_DEST%\inc\mozilla\htmlparser
+..\%__SRC%\inc\imgicon\* %_DEST%\inc\mozilla\imgicon
+..\%__SRC%\inc\imglib2\* %_DEST%\inc\mozilla\imglib2
+..\%__SRC%\inc\import\* %_DEST%\inc\mozilla\import
+..\%__SRC%\inc\intl\* %_DEST%\inc\mozilla\intl
+..\%__SRC%\inc\intlcmpt\* %_DEST%\inc\mozilla\intlcmpt
+..\%__SRC%\inc\jar\* %_DEST%\inc\mozilla\jar
+..\%__SRC%\inc\java\* %_DEST%\inc\mozilla\java
+..\%__SRC%\inc\jpeg\* %_DEST%\inc\mozilla\jpeg
+..\%__SRC%\inc\js\* %_DEST%\inc\mozilla\js
+..\%__SRC%\inc\jsconsole\* %_DEST%\inc\mozilla\jsconsole
+..\%__SRC%\inc\jsurl\* %_DEST%\inc\mozilla\jsurl
+..\%__SRC%\inc\layout\* %_DEST%\inc\mozilla\layout
+..\%__SRC%\inc\layout_xul\* %_DEST%\inc\mozilla\layout_xul
+..\%__SRC%\inc\ldap\* %_DEST%\inc\mozilla\ldap
+..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc\mozilla\ldap\ldap
+..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc\mozilla\ldap-nspr
+..\%__SRC%\inc\locale\* %_DEST%\inc\mozilla\locale
+..\%__SRC%\inc\lwbrk\* %_DEST%\inc\mozilla\lwbrk
+..\%__SRC%\inc\mailnews\* %_DEST%\inc\mozilla\mailnews
+..\%__SRC%\inc\mime\* %_DEST%\inc\mozilla\mime
+..\%__SRC%\inc\mimeemitter\* %_DEST%\inc\mozilla\mimeemitter
+..\%__SRC%\inc\mimetype\* %_DEST%\inc\mozilla\mimetype
+..\%__SRC%\inc\mng\* %_DEST%\inc\mozilla\mng
+..\%__SRC%\inc\mork\* %_DEST%\inc\mozilla\mork
+..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc\mozilla\mozbrwsr
+..\%__SRC%\inc\mozldap\* %_DEST%\inc\mozilla\mozldap
+..\%__SRC%\inc\mozreg\* %_DEST%\inc\mozilla\mozreg
+..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc\mozilla\mpfilelocprovider
+..\%__SRC%\inc\msgbase\* %_DEST%\inc\mozilla\msgbase
+..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc\mozilla\msgbaseutil
+..\%__SRC%\inc\msgcompo\* %_DEST%\inc\mozilla\msgcompo
+..\%__SRC%\inc\msgdb\* %_DEST%\inc\mozilla\msgdb
+..\%__SRC%\inc\msgimap\* %_DEST%\inc\mozilla\msgimap
+..\%__SRC%\inc\msglocal\* %_DEST%\inc\mozilla\msglocal
+..\%__SRC%\inc\msgnews\* %_DEST%\inc\mozilla\msgnews
+..\%__SRC%\inc\msgsearch\* %_DEST%\inc\mozilla\msgsearch
+..\%__SRC%\inc\necko\* %_DEST%\inc\mozilla\necko
+..\%__SRC%\inc\necko2\* %_DEST%\inc\mozilla\necko2
+..\%__SRC%\inc\nkcache\* %_DEST%\inc\mozilla\nkcache
+..\%__SRC%\inc\nspr\* %_DEST%\inc\mozilla\nspr
+..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc\mozilla\nspr\obsolete
+..\%__SRC%\inc\nspr\private\* %_DEST%\inc\mozilla\nspr\private
+..\%__SRC%\inc\nsprefm\* %_DEST%\inc\mozilla\nsprefm
+..\%__SRC%\inc\nss\* %_DEST%\inc\mozilla\nss
+..\%__SRC%\inc\oji\* %_DEST%\inc\mozilla\oji
+..\%__SRC%\inc\obsolete\* %_DEST%\inc\mozilla\obsolete
+..\%__SRC%\inc\plugin\* %_DEST%\inc\mozilla\plugin
+..\%__SRC%\inc\png\* %_DEST%\inc\mozilla\png
+..\%__SRC%\inc\pref\* %_DEST%\inc\mozilla\pref
+..\%__SRC%\inc\prefmigr\* %_DEST%\inc\mozilla\prefmigr
+..\%__SRC%\inc\profile\* %_DEST%\inc\mozilla\profile
+..\%__SRC%\inc\rdf\* %_DEST%\inc\mozilla\rdf
+..\%__SRC%\inc\rdfutil\* %_DEST%\inc\mozilla\rdfutil
+..\%__SRC%\inc\regviewer\* %_DEST%\inc\mozilla\regviewer
+..\%__SRC%\inc\related\* %_DEST%\inc\mozilla\related
+..\%__SRC%\inc\search\* %_DEST%\inc\mozilla\search
+..\%__SRC%\inc\setuprsc\* %_DEST%\inc\mozilla\setuprsc
+..\%__SRC%\inc\shistory\* %_DEST%\inc\mozilla\shistory
+..\%__SRC%\inc\sidebar\* %_DEST%\inc\mozilla\sidebar
+..\%__SRC%\inc\signonviewer\* %_DEST%\inc\mozilla\signonviewer
+..\%__SRC%\inc\string\* %_DEST%\inc\mozilla\string
+..\%__SRC%\inc\timer\* %_DEST%\inc\mozilla\timer
+..\%__SRC%\inc\transformiix\* %_DEST%\inc\mozilla\transformiix
+..\%__SRC%\inc\txmgr\* %_DEST%\inc\mozilla\txmgr
+..\%__SRC%\inc\txtsvc\* %_DEST%\inc\mozilla\txtsvc
+..\%__SRC%\inc\uconv\* %_DEST%\inc\mozilla\uconv
+..\%__SRC%\inc\unicharutil\* %_DEST%\inc\mozilla\unicharutil
+..\%__SRC%\inc\uninstall\* %_DEST%\inc\mozilla\uninstall
+..\%__SRC%\inc\uriloader\* %_DEST%\inc\mozilla\uriloader
+..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc\mozilla\urlbarhistory
+..\%__SRC%\inc\util\* %_DEST%\inc\mozilla\util
+..\%__SRC%\inc\view\* %_DEST%\inc\mozilla\view
+..\%__SRC%\inc\wallet\* %_DEST%\inc\mozilla\wallet
+..\%__SRC%\inc\walleteditor\* %_DEST%\inc\mozilla\walleteditor
+..\%__SRC%\inc\walletpreview\* %_DEST%\inc\mozilla\walletpreview
+..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc\mozilla\webBrowser_core
+..\%__SRC%\inc\webshell\* %_DEST%\inc\mozilla\webshell
+..\%__SRC%\inc\widget\* %_DEST%\inc\mozilla\widget
+..\%__SRC%\inc\windowwatcher\* %_DEST%\inc\mozilla\windowwatcher
+..\%__SRC%\inc\xml-rpc\* %_DEST%\inc\mozilla\xml-rpc
+..\%__SRC%\inc\xmlextras\* %_DEST%\inc\mozilla\xmlextras
+..\%__SRC%\inc\xpcom\* %_DEST%\inc\mozilla\xpcom
+..\%__SRC%\inc\xpconnect\* %_DEST%\inc\mozilla\xpconnect
+..\%__SRC%\inc\xpicleanup\* %_DEST%\inc\mozilla\xpicleanup
+..\%__SRC%\inc\xpinstall\* %_DEST%\inc\mozilla\xpinstall
+..\%__SRC%\inc\xpnet\* %_DEST%\inc\mozilla\xpnet
+..\%__SRC%\inc\zlib\* %_DEST%\inc\mozilla\zlib
+..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc\mozilla\xpcom_obsolete
 
-..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a   %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libldap50.* %_DEST%\lib
+..\%__SRC%\lib\libmozjs.* %_DEST%\lib
+..\%__SRC%\lib\libmozz.* %_DEST%\lib
+..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib
+..\%__SRC%\lib\libnssckbi.* %_DEST%\lib
+..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib
+..\%__SRC%\lib\libnssutil3.* %_DEST%\lib
+..\%__SRC%\lib\libprldap50.* %_DEST%\lib
+..\%__SRC%\lib\libxpcom.* %_DEST%\lib
+..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib
+..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib
+..\%__SRC%\lib\*.a   %_DEST%\lib
+..\%__SRC%\lib\*.lib %_DEST%\lib
 
-mkdir: %_DEST%\lib%_EXT%\sqlite
-..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite
+mkdir: %_DEST%\lib\sqlite
+..\%__SRC%\lib\libsqlite3.* %_DEST%\lib\sqlite
 
-..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%
+..\%__SRC%\bin\*.zip %_DEST%\bin