[Libreoffice-commits] .: avmedia/prj basic/prj configmgr/prj connectivity/prj desktop/prj drawinglayer/prj embeddedobj/prj eventattacher/prj fpicker/prj idl/prj linguistic/prj officecfg/prj oovbaapi/prj readlicense_oo/prj scripting/prj shell/prj svx/prj sysui/prj ucb/prj uui/prj vbahelper/prj xmlhelp/prj xmlscript/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 3 03:50:37 PDT 2011
avmedia/prj/d.lst | 38 ++---
basic/prj/d.lst | 50 +++----
configmgr/prj/d.lst | 8 -
connectivity/prj/d.lst | 98 +++++++--------
desktop/prj/d.lst | 304 +++++++++++++++++++++++------------------------
drawinglayer/prj/d.lst | 1
embeddedobj/prj/d.lst | 16 +-
eventattacher/prj/d.lst | 8 -
fpicker/prj/d.lst | 20 +--
idl/prj/d.lst | 4
linguistic/prj/d.lst | 18 +-
officecfg/prj/d.lst | 114 ++++++++---------
oovbaapi/prj/d.lst | 24 +--
readlicense_oo/prj/d.lst | 30 ++--
scripting/prj/d.lst | 46 +++----
shell/prj/d.lst | 62 ++++-----
svx/prj/d.lst | 10 -
sysui/prj/d.lst | 38 ++---
ucb/prj/d.lst | 90 ++++++-------
uui/prj/d.lst | 16 +-
vbahelper/prj/d.lst | 2
xmlhelp/prj/d.lst | 24 +--
xmlscript/prj/d.lst | 24 +--
23 files changed, 522 insertions(+), 523 deletions(-)
New commits:
commit 834c8f17c1adfe03f5e336725a5ffbb817be1d90
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:27:08 2011 +0300
Drop %_EXT% which was always empty
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index 23f7c35..12fea55 100644
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -1,23 +1,23 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
+mkdir: %COMMON_DEST%\bin\hid
+mkdir: %COMMON_DEST%\res
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll
-..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\%__SRC%\bin\avmedia*.dll %_DEST%\bin\avmedia*.dll
+..\source\java\avmedia.jar %_DEST%\bin\avmedia.jar
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\bin\avmedia*.res %_DEST%\bin\avmedia*.res
-mkdir: %_DEST%\inc%_EXT%\avmedia
+mkdir: %_DEST%\inc\avmedia
-..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx
-..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx
-..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx
-..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
+..\inc\avmedia\mediawindow.hxx %_DEST%\inc\avmedia\mediawindow.hxx
+..\inc\avmedia\mediaitem.hxx %_DEST%\inc\avmedia\mediaitem.hxx
+..\inc\avmedia\mediaplayer.hxx %_DEST%\inc\avmedia\mediaplayer.hxx
+..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc\avmedia\mediatoolbox.hxx
-..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
-..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
-..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
-..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml%_EXT%\avmediagstreamer.component
-..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
+..\%__SRC%\class\avmedia.jar %_DEST%\bin\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml\avmediaQuickTime.component
+..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml\avmediagstreamer.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml\avmediawin.component
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index 41d1a59..8aa0b83 100644
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -1,29 +1,29 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
+mkdir: %COMMON_DEST%\bin\hid
+mkdir: %COMMON_DEST%\res
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\basic.lib %_DEST%\lib%_EXT%\basic.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
-..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
-..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res%_EXT%\basic_srs.hid
-..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
-..\%__SRC%\bin\sb?????.sym %_DEST%\bin%_EXT%\sb?????.sym
-..\%__SRC%\misc\sb?????.map %_DEST%\bin%_EXT%\sb?????.map
-..\%__SRC%\bin\stt*.res %_DEST%\bin%_EXT%\stt*.res
-..\%__SRC%\bin\sb*.res %_DEST%\bin%_EXT%\sb*.res
-..\%__SRC%\lib\app.lib %_DEST%\lib%_EXT%\app.lib
-..\%__SRC%\lib\libapp.a %_DEST%\lib%_EXT%\libapp.a
-..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
-..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\%__SRC%\lib\basic.lib %_DEST%\lib\basic.lib
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\sb.lib %_DEST%\lib\xsb.lib
+..\%__SRC%\srs\classes.srs %_DEST%\res\basic.srs
+..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res\basic_srs.hid
+..\%__SRC%\bin\sb?????.dll %_DEST%\bin\sb?????.dll
+..\%__SRC%\bin\sb?????.sym %_DEST%\bin\sb?????.sym
+..\%__SRC%\misc\sb?????.map %_DEST%\bin\sb?????.map
+..\%__SRC%\bin\stt*.res %_DEST%\bin\stt*.res
+..\%__SRC%\bin\sb*.res %_DEST%\bin\sb*.res
+..\%__SRC%\lib\app.lib %_DEST%\lib\app.lib
+..\%__SRC%\lib\libapp.a %_DEST%\lib\libapp.a
+..\%__SRC%\lib\sample.lib %_DEST%\lib\sample.lib
+..\%__SRC%\lib\libsample.a %_DEST%\lib\libsample.a
-mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
-..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc
-..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h
+mkdir: %_DEST%\inc\basic
+..\inc\basic\*.hxx %_DEST%\inc\basic\*.hxx
+..\inc\basic\*.hrc %_DEST%\inc\basic\*.hrc
+..\inc\basic\*.h %_DEST%\inc\basic\*.h
-..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
-..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component
+..\inc\modsizeexceeded.hxx %_DEST%\inc\basic\modsizeexceeded.hxx
+..\%__SRC%\misc\sb.component %_DEST%\xml\sb.component
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index 34b6cf3..e2eac0f 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll
-..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib
-..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so
-..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component
+..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin\configmgr.uno.dll
+..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib\configmgr.uno.dylib
+..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib\configmgr.uno.so
+..\%__SRC%\misc\configmgr.component %_DEST%\xml\configmgr.component
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 22bffa6..03f2a8b 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -1,51 +1,51 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
-..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
-..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
-..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\adabas\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\ado\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\kab\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\macab\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\file\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\flat\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\jdbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mozab\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.jnilib %_DEST%\lib\*.jnilib
+..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
+..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
+..\source\cpool\*.xml %_DEST%\xml\*.xml
+..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
+..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
+..\source\drivers\kab\*.xml %_DEST%\xml\*.xml
+..\source\drivers\macab\*.xml %_DEST%\xml\*.xml
+..\source\drivers\file\*.xml %_DEST%\xml\*.xml
+..\source\drivers\flat\*.xml %_DEST%\xml\*.xml
+..\source\drivers\dbase\*.xml %_DEST%\xml\*.xml
+..\source\drivers\jdbc\*.xml %_DEST%\xml\*.xml
+..\source\drivers\odbc\*.xml %_DEST%\xml\*.xml
+..\source\drivers\mozab\*.xml %_DEST%\xml\*.xml
+..\source\drivers\evoab2\*.xml %_DEST%\xml\*.xml
+..\source\drivers\calc\*.xml %_DEST%\xml\*.xml
+..\source\drivers\mysql\*.xml %_DEST%\xml\*.xml
+..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-mkdir: %_DEST%\inc%_EXT%\connectivity
-mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
-mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
+mkdir: %_DEST%\inc\connectivity
+mkdir: %_DEST%\inc\connectivity\sdbcx
+mkdir: %_DEST%\xml\registry\spool\DataAccess
-..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx
-..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
-..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
-#..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
-..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component
-..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component
-..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component
-..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
-..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
-..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
-..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
-..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
-..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
-..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
-..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
-..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
-..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
-..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
-..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
-..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
+..\inc\connectivity\*.hxx %_DEST%\inc\connectivity\*.hxx
+..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc\connectivity\sqlbison.hxx
+..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc\connectivity\sdbcx\*.hxx
+#..\version.mk %_DEST%\inc\connectivity\version.mk
+..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml\registry\spool\DataAccess\*.xcu
+..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip
+..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip
+..\%__SRC%\misc\adabas.component %_DEST%\xml\adabas.component
+..\%__SRC%\misc\ado.component %_DEST%\xml\ado.component
+..\%__SRC%\misc\calc.component %_DEST%\xml\calc.component
+..\%__SRC%\misc\dbase.component %_DEST%\xml\dbase.component
+..\%__SRC%\misc\dbpool2.component %_DEST%\xml\dbpool2.component
+..\%__SRC%\misc\dbtools.component %_DEST%\xml\dbtools.component
+..\%__SRC%\misc\evoab.component %_DEST%\xml\evoab.component
+..\%__SRC%\misc\flat.component %_DEST%\xml\flat.component
+..\%__SRC%\misc\hsqldb.component %_DEST%\xml\hsqldb.component
+..\%__SRC%\misc\jdbc.component %_DEST%\xml\jdbc.component
+..\%__SRC%\misc\kab1.component %_DEST%\xml\kab1.component
+..\%__SRC%\misc\macab1.component %_DEST%\xml\macab1.component
+..\%__SRC%\misc\mozab.component %_DEST%\xml\mozab.component
+..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml\mozbootstrap.component
+..\%__SRC%\misc\mysql.component %_DEST%\xml\mysql.component
+..\%__SRC%\misc\odbc.component %_DEST%\xml\odbc.component
+..\%__SRC%\misc\sdbc2.component %_DEST%\xml\sdbc2.component
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index cb4fa06..9fa248f 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -1,152 +1,152 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\bin%_EXT%\so
-mkdir: %_DEST%\bin%_EXT%\c01
-mkdir: %_DEST%\bin%_EXT%\c05
-mkdir: %_DEST%\bin%_EXT%\c08
-mkdir: %_DEST%\bin%_EXT%\odf4ms
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\soffice.bin %_DEST%\bin%_EXT%\soffice.bin
-..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
-..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
-..\%__SRC%\bin\soffice_mac %_DEST%\bin%_EXT%\soffice
-..\%__SRC%\bin\oosplash %_DEST%\bin%_EXT%\oosplash.bin
-..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
-..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
-..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
-..\%__SRC%\bin\so\soffice_mac %_DEST%\bin%_EXT%\so\soffice
-..\%__SRC%\bin\sofficea*.dll %_DEST%\bin%_EXT%\sofficea*.dll
-..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib%_EXT%\isofficeapp.lib
-..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib%_EXT%\libsofficeapp.dylib
-..\%__SRC%\lib\libsofficeapp.so %_DEST%\lib%_EXT%\libsofficeapp.so
-
-..\%__SRC%\bin\soffice_oo.exe %_DEST%\bin%_EXT%\soffice_oo.exe
-..\%__SRC%\bin\soffice_oo %_DEST%\bin%_EXT%\soffice_oo.bin
-..\%__SRC%\bin\so\soffice_so.exe %_DEST%\bin%_EXT%\so\soffice_so.exe
-..\%__SRC%\bin\so\soffice_so %_DEST%\bin%_EXT%\so\soffice_so.bin
-
-..\%__SRC%\bin\scalc.exe %_DEST%\bin%_EXT%\scalc.exe
-..\%__SRC%\bin\sdraw.exe %_DEST%\bin%_EXT%\sdraw.exe
-..\%__SRC%\bin\simpress.exe %_DEST%\bin%_EXT%\simpress.exe
-..\%__SRC%\bin\smath.exe %_DEST%\bin%_EXT%\smath.exe
-..\%__SRC%\bin\swriter.exe %_DEST%\bin%_EXT%\swriter.exe
-..\%__SRC%\bin\sbase.exe %_DEST%\bin%_EXT%\sbase.exe
-..\%__SRC%\bin\sweb.exe %_DEST%\bin%_EXT%\sweb.exe
-..\%__SRC%\bin\os2quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
-..\%__SRC%\bin\so\scalc.exe %_DEST%\bin%_EXT%\so\scalc.exe
-..\%__SRC%\bin\so\sdraw.exe %_DEST%\bin%_EXT%\so\sdraw.exe
-..\%__SRC%\bin\so\simpress.exe %_DEST%\bin%_EXT%\so\simpress.exe
-..\%__SRC%\bin\so\smath.exe %_DEST%\bin%_EXT%\so\smath.exe
-..\%__SRC%\bin\so\swriter.exe %_DEST%\bin%_EXT%\so\swriter.exe
-..\%__SRC%\bin\so\sbase.exe %_DEST%\bin%_EXT%\so\sbase.exe
-..\%__SRC%\bin\so\sweb.exe %_DEST%\bin%_EXT%\so\sweb.exe
-
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\install_quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\install_quickstart.exe
-
-..\%__SRC%\misc\soffice.exe.manifest %_DEST%\bin%_EXT%\soffice.exe.manifest
-..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin%_EXT%\soffice.bin.manifest
-..\%__SRC%\bin\wrp*.dll %_DEST%\bin%_EXT%\wrp*.dll
-..\%__SRC%\bin\spl*.dll %_DEST%\bin%_EXT%\spl*.dll
-..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
-..\%__SRC%\obj\officeloader.obj %_DEST%\lib%_EXT%\officeloader.obj
-..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib%_EXT%\extendloaderenvironment.obj
-..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib%_EXT%\copyright_ascii_sun.obj
-..\%__SRC%\obj\main.obj %_DEST%\lib%_EXT%\main.obj
-..\%__SRC%\lib\libwrp*.so %_DEST%\lib%_EXT%\libwrp*.so
-..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib
-..\%__SRC%\lib\libspl*.so %_DEST%\lib%_EXT%\libspl*.so
-..\%__SRC%\lib\libspl*.dylib %_DEST%\lib%_EXT%\libspl*.dylib
-..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so
-..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib
-..\%__SRC%\bin\offacc*.dll %_DEST%\bin%_EXT%\offacc*.dll
-..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so
-..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib
-..\%__SRC%\bin\migratio*.dll %_DEST%\bin%_EXT%\migratio*.dll
-..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib%_EXT%\migratio*.uno.so
-..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib%_EXT%\migratio*.uno.dylib
-
-..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin
-
-..\%__SRC%\bin\loader2.ex? %_DEST%\bin%_EXT%\loader2.ex?
-
-..\%__SRC%\bin\depl*.dll %_DEST%\bin%_EXT%\depl*.dll
-..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib%_EXT%\deployment*.uno.so
-..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib%_EXT%\deployment*.uno.dylib
-..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin%_EXT%\deploymentmisc*.dll
-..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib%_EXT%\libdeploymentmisc*.so
-..\%__SRC%\lib\libdeploymentmisc*.dylib %_DEST%\lib%_EXT%\libdeploymentmisc*.dylib
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\unopkg.exe
-..\%__SRC%\bin\so\guiloader.exe %_DEST%\bin%_EXT%\so\unopkg.exe
-..\%__SRC%\bin\unopkg %_DEST%\bin%_EXT%\unopkg.bin
-..\%__SRC%\bin\so\unopkg %_DEST%\bin%_EXT%\so\unopkg.bin
-..\%__SRC%\bin\unopkg.exe %_DEST%\bin%_EXT%\unopkg.bin
-..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin%_EXT%\so\unopkg.bin
-..\%__SRC%\misc\unopkg.sh %_DEST%\bin%_EXT%\unopkg
-..\%__SRC%\bin\unopkga*.dll %_DEST%\bin%_EXT%\unopkga*.dll
-..\%__SRC%\lib\libunopkgapp.dylib %_DEST%\lib%_EXT%\libunopkgapp.dylib
-..\%__SRC%\lib\libunopkgapp.so %_DEST%\lib%_EXT%\libunopkgapp.so
-..\%__SRC%\bin\rebasegui.exe %_DEST%\bin%_EXT%\rebasegui.exe
-..\%__SRC%\bin\rebaseoo.exe %_DEST%\bin%_EXT%\rebaseoo.exe
-
-..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein
-..\%__SRC%\misc\pagein-* %_DEST%\bin%_EXT%\pagein-*
-
-..\%__SRC%\bin\unoinfo.exe %_DEST%\bin%_EXT%\unoinfo.exe
-..\%__SRC%\misc\unoinfo.sh %_DEST%\bin%_EXT%\unoinfo
-
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\%__SRC%\misc\soffice.sh-expanded %_DEST%\bin%_EXT%\soffice
-..\%__SRC%\misc\sbase.sh %_DEST%\bin%_EXT%\sbase
-..\%__SRC%\misc\scalc.sh %_DEST%\bin%_EXT%\scalc
-..\%__SRC%\misc\sdraw.sh %_DEST%\bin%_EXT%\sdraw
-..\%__SRC%\misc\simpress.sh %_DEST%\bin%_EXT%\simpress
-..\%__SRC%\misc\smaster.sh %_DEST%\bin%_EXT%\smaster
-..\%__SRC%\misc\smath.sh %_DEST%\bin%_EXT%\smath
-..\%__SRC%\misc\sweb.sh %_DEST%\bin%_EXT%\sweb
-..\%__SRC%\misc\swriter.sh %_DEST%\bin%_EXT%\swriter
-..\%__SRC%\misc\nswrapper.sh %_DEST%\bin%_EXT%\nswrapper
-..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin%_EXT%\mozwrapper
-
-mkdir: %COMMON_DEST%\pck%_EXT%\brand
-mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev
-
-..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
-..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip
-..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip
-..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck%_EXT%\shell.zip
-
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
-
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin%_EXT%\guistdio.com
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin%_EXT%\crashrep.com
-..\%__SRC%\bin\unopkgio.exe %_DEST%\bin%_EXT%\unopkg.com
-
-..\scripts\ure-link %_DEST%\bin%_EXT%\ure-link
-..\scripts\basis-link %_DEST%\bin%_EXT%\basis-link
-..\scripts\basis-link %_DEST%\bin%_EXT%\c01\basis-link
-..\scripts\basis-link %_DEST%\bin%_EXT%\c05\basis-link
-..\scripts\basis-link %_DEST%\bin%_EXT%\c08\basis-link
-..\scripts\so-basis-link %_DEST%\bin%_EXT%\so\basis-link
-..\scripts\odf-basis-link %_DEST%\bin%_EXT%\odf4ms\basis-link
-
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
-
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
-..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component
-..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component
-..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component
-..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component
-..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component
-..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component
-..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component
-..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component
-..\%__SRC%\misc\splash.component %_DEST%\xml%_EXT%\splash.component
+mkdir: %COMMON_DEST%\bin\hid
+mkdir: %_DEST%\bin\so
+mkdir: %_DEST%\bin\c01
+mkdir: %_DEST%\bin\c05
+mkdir: %_DEST%\bin\c08
+mkdir: %_DEST%\bin\odf4ms
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\%__SRC%\bin\soffice.bin %_DEST%\bin\soffice.bin
+..\%__SRC%\bin\officeloader.exe %_DEST%\bin\soffice.exe
+..\%__SRC%\bin\soffice %_DEST%\bin\soffice.bin
+..\%__SRC%\bin\soffice_mac %_DEST%\bin\soffice
+..\%__SRC%\bin\oosplash %_DEST%\bin\oosplash.bin
+..\%__SRC%\bin\so\soffice.bin %_DEST%\bin\so\soffice.bin
+..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin\so\soffice.exe
+..\%__SRC%\bin\so\soffice %_DEST%\bin\so\soffice.bin
+..\%__SRC%\bin\so\soffice_mac %_DEST%\bin\so\soffice
+..\%__SRC%\bin\sofficea*.dll %_DEST%\bin\sofficea*.dll
+..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib\isofficeapp.lib
+..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib\libsofficeapp.dylib
+..\%__SRC%\lib\libsofficeapp.so %_DEST%\lib\libsofficeapp.so
+
+..\%__SRC%\bin\soffice_oo.exe %_DEST%\bin\soffice_oo.exe
+..\%__SRC%\bin\soffice_oo %_DEST%\bin\soffice_oo.bin
+..\%__SRC%\bin\so\soffice_so.exe %_DEST%\bin\so\soffice_so.exe
+..\%__SRC%\bin\so\soffice_so %_DEST%\bin\so\soffice_so.bin
+
+..\%__SRC%\bin\scalc.exe %_DEST%\bin\scalc.exe
+..\%__SRC%\bin\sdraw.exe %_DEST%\bin\sdraw.exe
+..\%__SRC%\bin\simpress.exe %_DEST%\bin\simpress.exe
+..\%__SRC%\bin\smath.exe %_DEST%\bin\smath.exe
+..\%__SRC%\bin\swriter.exe %_DEST%\bin\swriter.exe
+..\%__SRC%\bin\sbase.exe %_DEST%\bin\sbase.exe
+..\%__SRC%\bin\sweb.exe %_DEST%\bin\sweb.exe
+..\%__SRC%\bin\os2quickstart.exe %_DEST%\bin\quickstart.exe
+..\%__SRC%\bin\so\scalc.exe %_DEST%\bin\so\scalc.exe
+..\%__SRC%\bin\so\sdraw.exe %_DEST%\bin\so\sdraw.exe
+..\%__SRC%\bin\so\simpress.exe %_DEST%\bin\so\simpress.exe
+..\%__SRC%\bin\so\smath.exe %_DEST%\bin\so\smath.exe
+..\%__SRC%\bin\so\swriter.exe %_DEST%\bin\so\swriter.exe
+..\%__SRC%\bin\so\sbase.exe %_DEST%\bin\so\sbase.exe
+..\%__SRC%\bin\so\sweb.exe %_DEST%\bin\so\sweb.exe
+
+..\%__SRC%\bin\quickstart.exe %_DEST%\bin\quickstart.exe
+..\%__SRC%\bin\quickstart.exe %_DEST%\bin\install_quickstart.exe
+..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\quickstart.exe
+..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\install_quickstart.exe
+
+..\%__SRC%\misc\soffice.exe.manifest %_DEST%\bin\soffice.exe.manifest
+..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin\soffice.bin.manifest
+..\%__SRC%\bin\wrp*.dll %_DEST%\bin\wrp*.dll
+..\%__SRC%\bin\spl*.dll %_DEST%\bin\spl*.dll
+..\%__SRC%\bin\socomp.dll %_DEST%\bin\socomp.dll
+..\%__SRC%\obj\officeloader.obj %_DEST%\lib\officeloader.obj
+..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib\extendloaderenvironment.obj
+..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib\copyright_ascii_sun.obj
+..\%__SRC%\obj\main.obj %_DEST%\lib\main.obj
+..\%__SRC%\lib\libwrp*.so %_DEST%\lib\libwrp*.so
+..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib\libwrp*.dylib
+..\%__SRC%\lib\libspl*.so %_DEST%\lib\libspl*.so
+..\%__SRC%\lib\libspl*.dylib %_DEST%\lib\libspl*.dylib
+..\%__SRC%\lib\libsocomp.so %_DEST%\lib\libsocomp.so
+..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib\libsocomp.dylib
+..\%__SRC%\bin\offacc*.dll %_DEST%\bin\offacc*.dll
+..\%__SRC%\lib\liboffacc*.so %_DEST%\lib\liboffacc*.so
+..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib\liboffacc*.dylib
+..\%__SRC%\bin\migratio*.dll %_DEST%\bin\migratio*.dll
+..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib\migratio*.uno.so
+..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib\migratio*.uno.dylib
+
+..\%__SRC%\bin\sweb %_DEST%\bin\sweb.bin
+
+..\%__SRC%\bin\loader2.ex? %_DEST%\bin\loader2.ex?
+
+..\%__SRC%\bin\depl*.dll %_DEST%\bin\depl*.dll
+..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib\deployment*.uno.so
+..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib\deployment*.uno.dylib
+..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin\deploymentmisc*.dll
+..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib\libdeploymentmisc*.so
+..\%__SRC%\lib\libdeploymentmisc*.dylib %_DEST%\lib\libdeploymentmisc*.dylib
+..\%__SRC%\bin\guiloader.exe %_DEST%\bin\unopkg.exe
+..\%__SRC%\bin\so\guiloader.exe %_DEST%\bin\so\unopkg.exe
+..\%__SRC%\bin\unopkg %_DEST%\bin\unopkg.bin
+..\%__SRC%\bin\so\unopkg %_DEST%\bin\so\unopkg.bin
+..\%__SRC%\bin\unopkg.exe %_DEST%\bin\unopkg.bin
+..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin\so\unopkg.bin
+..\%__SRC%\misc\unopkg.sh %_DEST%\bin\unopkg
+..\%__SRC%\bin\unopkga*.dll %_DEST%\bin\unopkga*.dll
+..\%__SRC%\lib\libunopkgapp.dylib %_DEST%\lib\libunopkgapp.dylib
+..\%__SRC%\lib\libunopkgapp.so %_DEST%\lib\libunopkgapp.so
+..\%__SRC%\bin\rebasegui.exe %_DEST%\bin\rebasegui.exe
+..\%__SRC%\bin\rebaseoo.exe %_DEST%\bin\rebaseoo.exe
+
+..\%__SRC%\bin\pagein %_DEST%\bin\pagein
+..\%__SRC%\misc\pagein-* %_DEST%\bin\pagein-*
+
+..\%__SRC%\bin\unoinfo.exe %_DEST%\bin\unoinfo.exe
+..\%__SRC%\misc\unoinfo.sh %_DEST%\bin\unoinfo
+
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
+
+..\%__SRC%\misc\soffice.sh-expanded %_DEST%\bin\soffice
+..\%__SRC%\misc\sbase.sh %_DEST%\bin\sbase
+..\%__SRC%\misc\scalc.sh %_DEST%\bin\scalc
+..\%__SRC%\misc\sdraw.sh %_DEST%\bin\sdraw
+..\%__SRC%\misc\simpress.sh %_DEST%\bin\simpress
+..\%__SRC%\misc\smaster.sh %_DEST%\bin\smaster
+..\%__SRC%\misc\smath.sh %_DEST%\bin\smath
+..\%__SRC%\misc\sweb.sh %_DEST%\bin\sweb
+..\%__SRC%\misc\swriter.sh %_DEST%\bin\swriter
+..\%__SRC%\misc\nswrapper.sh %_DEST%\bin\nswrapper
+..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin\mozwrapper
+
+mkdir: %COMMON_DEST%\pck\brand
+mkdir: %COMMON_DEST%\pck\brand_dev
+
+..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck\intro.zip
+..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck\brand\intro.zip
+..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck\brand_dev\intro.zip
+..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck\shell.zip
+
+..\%__SRC%\bin\guiloader.exe %_DEST%\bin\testtool.exe
+
+..\%__SRC%\bin\guistdio.exe %_DEST%\bin\guistdio.com
+..\%__SRC%\bin\guistdio.exe %_DEST%\bin\crashrep.com
+..\%__SRC%\bin\unopkgio.exe %_DEST%\bin\unopkg.com
+
+..\scripts\ure-link %_DEST%\bin\ure-link
+..\scripts\basis-link %_DEST%\bin\basis-link
+..\scripts\basis-link %_DEST%\bin\c01\basis-link
+..\scripts\basis-link %_DEST%\bin\c05\basis-link
+..\scripts\basis-link %_DEST%\bin\c08\basis-link
+..\scripts\so-basis-link %_DEST%\bin\so\basis-link
+..\scripts\odf-basis-link %_DEST%\bin\odf4ms\basis-link
+
+mkdir: %_DEST%\xml\registry\spool
+mkdir: %_DEST%\xml\registry\spool\org
+mkdir: %_DEST%\xml\registry\spool\org\openoffice
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
+
+..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
+..\%__SRC%\misc\deployment.component %_DEST%\xml\deployment.component
+..\%__SRC%\misc\deploymentgui.component %_DEST%\xml\deploymentgui.component
+..\%__SRC%\misc\migrationoo2.component %_DEST%\xml\migrationoo2.component
+..\%__SRC%\misc\migrationoo3.component %_DEST%\xml\migrationoo3.component
+..\%__SRC%\misc\offacc.component %_DEST%\xml\offacc.component
+..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml\productregistration.jar.component
+..\%__SRC%\misc\socomp.component %_DEST%\xml\socomp.component
+..\%__SRC%\misc\spl.component %_DEST%\xml\spl.component
+..\%__SRC%\misc\splash.component %_DEST%\xml\splash.component
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
index e8c0ccc..b384ab6 100644
--- a/drawinglayer/prj/d.lst
+++ b/drawinglayer/prj/d.lst
@@ -1,2 +1,2 @@
-..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file
+..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file
diff --git a/embeddedobj/prj/d.lst b/embeddedobj/prj/d.lst
index e85b439..551439c 100644
--- a/embeddedobj/prj/d.lst
+++ b/embeddedobj/prj/d.lst
@@ -1,8 +1,8 @@
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\misc\embobj.component %_DEST%\xml%_EXT%\embobj.component
-..\%__SRC%\misc\emboleobj.component %_DEST%\xml%_EXT%\emboleobj.component
+mkdir: %_DEST%\xml\registry\spool
+..\%__SRC%\misc\*.map %_DEST%\bin\*.map
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\dtd\*.dtd %_DEST%\bin\*.*
+..\%__SRC%\misc\embobj.component %_DEST%\xml\embobj.component
+..\%__SRC%\misc\emboleobj.component %_DEST%\xml\emboleobj.component
diff --git a/eventattacher/prj/d.lst b/eventattacher/prj/d.lst
index 202a0a0..9b2d88d 100644
--- a/eventattacher/prj/d.lst
+++ b/eventattacher/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%
-..\%__SRC%\misc\evtatt.component %_DEST%\xml%_EXT%\evtatt.component
+..\%__SRC%\bin\*.dll %_DEST%\bin
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.dylib %_DEST%\lib
+..\%__SRC%\misc\evtatt.component %_DEST%\xml\evtatt.component
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index ca6317e..71ec565 100644
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -1,13 +1,13 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\f*.res %_DEST%\bin%_EXT%\
-..\%__SRC%\bin\f*.dll %_DEST%\bin%_EXT%\
-..\%__SRC%\bin\kdefilepicker %_DEST%\bin%_EXT%\kdefilepicker
-..\%__SRC%\lib\f*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\bin\f*.res %_DEST%\bin\
+..\%__SRC%\bin\f*.dll %_DEST%\bin\
+..\%__SRC%\bin\kdefilepicker %_DEST%\bin\kdefilepicker
+..\%__SRC%\lib\f*.so %_DEST%\lib\
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\misc\*.component %_DEST%\xml%_EXT%\*.component
+..\source\win32\filepicker\*.xml %_DEST%\xml\*.xml
+..\source\win32\folderpicker\*.xml %_DEST%\xml\*.xml
+..\%__SRC%\misc\*.component %_DEST%\xml\*.component
diff --git a/idl/prj/d.lst b/idl/prj/d.lst
index bd88bc4..9940b5c 100644
--- a/idl/prj/d.lst
+++ b/idl/prj/d.lst
@@ -1,2 +1,2 @@
-..\%__SRC%\bin\svidl.exe %_DEST%\bin%_EXT%\svidl.exe
-..\%__SRC%\bin\svidl %_DEST%\bin%_EXT%\svidl
+..\%__SRC%\bin\svidl.exe %_DEST%\bin\svidl.exe
+..\%__SRC%\bin\svidl %_DEST%\bin\svidl
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 03237f9..ed24c0a 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -1,13 +1,13 @@
-..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng*
-..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng*
-..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\liblng*.so %_DEST%\lib%_EXT%\liblng*.so
+..\%__SRC%\bin\lng* %_DEST%\bin\lng*
+..\%__SRC%\lib\ilng* %_DEST%\lib\ilng*
+..\%__SRC%\lib\liblng.a %_DEST%\lib\liblng.a
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\liblng*.so %_DEST%\lib\liblng*.so
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
+..\xml\*.xml %_DEST%\xml\*.xml
-mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+mkdir: %_DEST%\inc\linguistic
+..\inc\linguistic\*.hxx %_DEST%\inc\linguistic\*.hxx
-..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
+..\%__SRC%\misc\lng.component %_DEST%\xml\lng.component
diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst
index debb965..ab622fc 100644
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
@@ -1,69 +1,69 @@
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\schema
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
+mkdir: %_DEST%\xml\registry
+mkdir: %_DEST%\xml\registry\schema
+mkdir: %_DEST%\xml\registry\schema\org
+mkdir: %_DEST%\xml\registry\schema\org\openoffice
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\UI
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\DataAccess
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\OOoImprovement
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\ucb
+mkdir: %_DEST%\xml\registry\schema\org\openoffice\TypeDetection
-..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\DataAccess\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
+..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs %_DEST%\xml\registry\schema\org\openoffice
+..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office
+..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\UI
+..\%__SRC%\misc\registry\schema\org\openoffice\Office\DataAccess\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\DataAccess
+..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\OOoImprovement
+..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs %_DEST%\xml\registry\schema\org\openoffice\ucb
+..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs %_DEST%\xml\registry\schema\org\openoffice\TypeDetection
-mkdir: %_DEST%\xml%_EXT%\registry\data
-mkdir: %_DEST%\xml%_EXT%\registry\data\org
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
+mkdir: %_DEST%\xml\registry\data
+mkdir: %_DEST%\xml\registry\data\org
+mkdir: %_DEST%\xml\registry\data\org\openoffice
+mkdir: %_DEST%\xml\registry\data\org\openoffice\Office
+mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\UI
+mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\DataAccess
+mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\OOoImprovement
+mkdir: %_DEST%\xml\registry\data\org\openoffice\ucb
+mkdir: %_DEST%\xml\registry\data\org\openoffice\TypeDetection
-..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ldap.xcd.sample
-..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ad-ldap.xcd.sample
+..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml\oo-ldap.xcd.sample
+..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml\oo-ad-ldap.xcd.sample
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice
-..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-..\%__SRC%\misc\registry\data\org\openoffice\Office\UI\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\data\org\openoffice\ucb\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-..\%__SRC%\misc\registry\data\org\openoffice\TypeDetection\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
+..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml\registry\data\org\openoffice
+..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office
+..\%__SRC%\misc\registry\data\org\openoffice\Office\UI\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\UI
+..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\DataAccess
+..\%__SRC%\misc\registry\data\org\openoffice\ucb\*.xcu %_DEST%\xml\registry\data\org\openoffice\ucb
+..\%__SRC%\misc\registry\data\org\openoffice\TypeDetection\*.xcu %_DEST%\xml\registry\data\org\openoffice\TypeDetection
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
+mkdir: %_DEST%\xml\registry\spool
+mkdir: %_DEST%\xml\registry\spool\org
+mkdir: %_DEST%\xml\registry\spool\org\openoffice
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\UI
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\ucb
+mkdir: %_DEST%\xml\registry\spool\org\openoffice\TypeDetection
-..\%__SRC%\misc\registry\spool\*.xcu %_DEST%\xml%_EXT%\registry\spool
-..\%__SRC%\misc\registry\spool\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\UI\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\spool\org\openoffice\ucb\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-..\%__SRC%\misc\registry\spool\org\openoffice\TypeDetection\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
+..\%__SRC%\misc\registry\spool\*.xcu %_DEST%\xml\registry\spool
+..\%__SRC%\misc\registry\spool\org\openoffice\*.xcu %_DEST%\xml\registry\spool\org\openoffice
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\UI\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\UI
+..\%__SRC%\misc\registry\spool\org\openoffice\ucb\*.xcu %_DEST%\xml\registry\spool\org\openoffice\ucb
+..\%__SRC%\misc\registry\spool\org\openoffice\TypeDetection\*.xcu %_DEST%\xml\registry\spool\org\openoffice\TypeDetection
-mkdir: %_DEST%\pck%_EXT%
+mkdir: %_DEST%\pck
-..\%__SRC%\misc\*.properties %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldif %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.conf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.map %_DEST%\pck%_EXT%
+..\%__SRC%\misc\*.properties %_DEST%\pck
+..\%__SRC%\misc\*.ldif %_DEST%\pck
+..\%__SRC%\misc\*.ldf %_DEST%\pck
+..\%__SRC%\misc\*.conf %_DEST%\pck
+..\%__SRC%\misc\*.map %_DEST%\pck
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%
+..\%__SRC%\bin\*.zip %_DEST%\pck
-mkdir: %_DEST%\xml%_EXT%\processing
+mkdir: %_DEST%\xml\processing
-..\util\*.xsl %_DEST%\xml%_EXT%\processing
-..\registry\*.dtd %_DEST%\xml%_EXT%\registry
+..\util\*.xsl %_DEST%\xml\processing
+..\registry\*.dtd %_DEST%\xml\registry
diff --git a/oovbaapi/prj/d.lst b/oovbaapi/prj/d.lst
index 86e801a..b560713 100644
--- a/oovbaapi/prj/d.lst
+++ b/oovbaapi/prj/d.lst
@@ -1,15 +1,15 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo
+mkdir: %COMMON_DEST%\idl\ooo
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\constants
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\excel
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\msforms
-mkdir: %COMMON_DEST%\idl%_EXT%\ooo\vba\word
+mkdir: %COMMON_DEST%\idl\ooo\vba
+mkdir: %COMMON_DEST%\idl\ooo\vba\constants
+mkdir: %COMMON_DEST%\idl\ooo\vba\excel
+mkdir: %COMMON_DEST%\idl\ooo\vba\msforms
+mkdir: %COMMON_DEST%\idl\ooo\vba\word
-..\%__SRC%\ucr\oovbaapi.db %_DEST%\bin%_EXT%\oovbaapi.rdb
+..\%__SRC%\ucr\oovbaapi.db %_DEST%\bin\oovbaapi.rdb
-..\ooo\vba\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba
-..\ooo\vba\constants\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\constants
-..\ooo\vba\excel\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\excel
-..\ooo\vba\msforms\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\msforms
-..\ooo\vba\word\*.idl %COMMON_DEST%\idl%_EXT%\ooo\vba\word
+..\ooo\vba\*.idl %COMMON_DEST%\idl\ooo\vba
+..\ooo\vba\constants\*.idl %COMMON_DEST%\idl\ooo\vba\constants
+..\ooo\vba\excel\*.idl %COMMON_DEST%\idl\ooo\vba\excel
+..\ooo\vba\msforms\*.idl %COMMON_DEST%\idl\ooo\vba\msforms
+..\ooo\vba\word\*.idl %COMMON_DEST%\idl\ooo\vba\word
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index d4d5026..09050bb 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -1,30 +1,30 @@
-mkdir: %_DEST%\bin%_EXT%\osl
-mkdir: %_DEST%\pck%_EXT%
+mkdir: %_DEST%\bin\osl
+mkdir: %_DEST%\pck
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
-..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\osl\LICENSE
-..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl\license.txt
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl\LICENSE.odt
+..\%__SRC%\misc\LICENSE %_DEST%\bin\osl\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin\osl\license.txt
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin\osl\LICENSE.odt
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
-..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin\CREDITS.odt
# URE:
-mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\ure\license.txt
+mkdir: %_DEST%\bin\ure
+..\%__SRC%\misc\LICENSE %_DEST%\bin\ure\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin\ure\license.txt
-..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
+..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin\THIRDPARTYLICENSEREADME.html
dos: echo =====================================================================
dos: echo Delivering README files
dos: echo =====================================================================
-..\%__SRC%\misc\WNT\readme_*.txt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\WNT\readme_*.html %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\WNT\readme_*.txt %_DEST%\bin\osl
+..\%__SRC%\misc\WNT\readme_*.html %_DEST%\bin\osl
+..\%__SRC%\misc\UNX\README_* %_DEST%\bin\osl
+..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin\osl
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
index 43905b2..f1caf45 100644
--- a/scripting/prj/d.lst
+++ b/scripting/prj/d.lst
@@ -1,29 +1,29 @@
-mkdir: %_DEST%\inc%_EXT%\scripting
-mkdir: %_DEST%\lib%_EXT%\pyuno
-mkdir: %_DEST%\bin%_EXT%\pyuno
+mkdir: %_DEST%\inc\scripting
+mkdir: %_DEST%\lib\pyuno
+mkdir: %_DEST%\bin\pyuno
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.zip %COMMON_DEST%\pck%_EXT%\*
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\*.py %_DEST%\bin%_EXT%\pyuno\*
-..\%__SRC%\lib\*.py %_DEST%\lib%_EXT%\pyuno\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\bin\*.dll %_DEST%\bin\*
+..\%__SRC%\bin\*.zip %COMMON_DEST%\pck\*
+..\%__SRC%\class\*.jar %_DEST%\bin\*
+..\%__SRC%\lib\*.so %_DEST%\lib\*
+..\%__SRC%\bin\*.py %_DEST%\bin\pyuno\*
+..\%__SRC%\lib\*.py %_DEST%\lib\pyuno\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
+..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
-..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml
+..\source\storage\storage.xml %_DEST%\xml\storage.xml
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
-..\%__SRC%\misc\mailmerge.component %_DEST%\xml%_EXT%\mailmerge.component
-..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml%_EXT%\ScriptFramework.component
-..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml%_EXT%\ScriptProviderForJava.component
-..\%__SRC%\misc\basprov.component %_DEST%\xml%_EXT%\basprov.component
-..\%__SRC%\misc\dlgprov.component %_DEST%\xml%_EXT%\dlgprov.component
-..\%__SRC%\misc\protocolhandler.component %_DEST%\xml%_EXT%\protocolhandler.component
-..\%__SRC%\misc\scriptframe.component %_DEST%\xml%_EXT%\scriptframe.component
-..\%__SRC%\misc\stringresource.component %_DEST%\xml%_EXT%\stringresource.component
-..\%__SRC%\misc\vbaevents.component %_DEST%\xml%_EXT%\vbaevents.component
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
+..\%__SRC%\misc\mailmerge.component %_DEST%\xml\mailmerge.component
+..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml\ScriptFramework.component
+..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml\ScriptProviderForJava.component
+..\%__SRC%\misc\basprov.component %_DEST%\xml\basprov.component
+..\%__SRC%\misc\dlgprov.component %_DEST%\xml\dlgprov.component
+..\%__SRC%\misc\protocolhandler.component %_DEST%\xml\protocolhandler.component
+..\%__SRC%\misc\scriptframe.component %_DEST%\xml\scriptframe.component
+..\%__SRC%\misc\stringresource.component %_DEST%\xml\stringresource.component
+..\%__SRC%\misc\vbaevents.component %_DEST%\xml\vbaevents.component
# Extensions
-..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
+..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index 3ef183d..679b34c 100644
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -1,34 +1,34 @@
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.uno.so %_DEST%\lib%_EXT%\*.uno.so
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin%_EXT%\shlxthdl_x64.dll
-..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin%_EXT%\ooofiltproxy_x64.dll
-..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin%_EXT%\ooofilt_x64.dll
-..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\misc\cmdmail.component %_DEST%\xml%_EXT%\cmdmail.component
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\slb\*.a %_DEST%\lib\*.a
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
+..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin\shlxthdl_x64.dll
+..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin\ooofiltproxy_x64.dll
+..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin\ooofilt_x64.dll
+..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin\propertyhdl_x64.dll
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\misc\cmdmail.component %_DEST%\xml\cmdmail.component
-..\%__SRC%\bin\open-url %_DEST%\bin%_EXT%\open-url
-..\%__SRC%\bin\cde-open-url %_DEST%\bin%_EXT%\cde-open-url
-..\%__SRC%\bin\kde-open-url %_DEST%\bin%_EXT%\kde-open-url
-..\%__SRC%\bin\gnome-open-url %_DEST%\bin%_EXT%\gnome-open-url
-..\%__SRC%\bin\gnome-open-url.bin %_DEST%\bin%_EXT%\gnome-open-url.bin
-..\%__SRC%\bin\senddoc %_DEST%\bin%_EXT%\senddoc
-..\%__SRC%\bin\uri-encode %_DEST%\bin%_EXT%\uri-encode
+..\%__SRC%\bin\open-url %_DEST%\bin\open-url
+..\%__SRC%\bin\cde-open-url %_DEST%\bin\cde-open-url
+..\%__SRC%\bin\kde-open-url %_DEST%\bin\kde-open-url
+..\%__SRC%\bin\gnome-open-url %_DEST%\bin\gnome-open-url
+..\%__SRC%\bin\gnome-open-url.bin %_DEST%\bin\gnome-open-url.bin
+..\%__SRC%\bin\senddoc %_DEST%\bin\senddoc
+..\%__SRC%\bin\uri-encode %_DEST%\bin\uri-encode
-..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml
+..\%__SRC%\misc\*.xml %_DEST%\xml\*.xml
-..\%__SRC%\misc\desktopbe1.component %_DEST%\xml%_EXT%\desktopbe1.component
-..\%__SRC%\misc\gconfbe1.component %_DEST%\xml%_EXT%\gconfbe1.component
-..\%__SRC%\misc\kde4be1.component %_DEST%\xml%_EXT%\kde4be1.component
-..\%__SRC%\misc\kdebe1.component %_DEST%\xml%_EXT%\kdebe1.component
-..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
-..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component
-..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component
-..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component
-..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component
-..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component
+..\%__SRC%\misc\desktopbe1.component %_DEST%\xml\desktopbe1.component
+..\%__SRC%\misc\gconfbe1.component %_DEST%\xml\gconfbe1.component
+..\%__SRC%\misc\kde4be1.component %_DEST%\xml\kde4be1.component
+..\%__SRC%\misc\kdebe1.component %_DEST%\xml\kdebe1.component
+..\inc\kde_headers.h %_DEST%\inc\shell\kde_headers.h
+..\%__SRC%\misc\localebe1.component %_DEST%\xml\localebe1.component
+..\%__SRC%\misc\macbe1.component %_DEST%\xml\macbe1.component
+..\%__SRC%\misc\smplmail.component %_DEST%\xml\smplmail.component
+..\%__SRC%\misc\syssh.component %_DEST%\xml\syssh.component
+..\%__SRC%\misc\wininetbe1.component %_DEST%\xml\wininetbe1.component
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index a52a907..d058ed4 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -1,5 +1,5 @@
-..\inc\svx\linkwarn.hxx %_DEST%\inc%_EXT%\svx\linkwarn.hxx
-..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx
-..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx
-..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx
-..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx
+..\inc\svx\linkwarn.hxx %_DEST%\inc\svx\linkwarn.hxx
+..\inc\svx\borderline.hxx %_DEST%\inc\svx\borderline.hxx
+..\inc\svx\boxitem.hxx %_DEST%\inc\svx\boxitem.hxx
+..\inc\svx\brkitem.hxx %_DEST%\inc\svx\brkitem.hxx
+..\inc\svx\brshitem.hxx %_DEST%\inc\svx\brshitem.hxx
diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index 918ee8b..b62b651 100644
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
@@ -1,23 +1,23 @@
-mkdir: %_DEST%\res%_EXT%\icons
-mkdir: %_DEST%\inc%_EXT%\icons
-mkdir: %_DEST%\bin%_EXT%\so
-mkdir: %_DEST%\bin%_EXT%\desktop-integration
-mkdir: %_DEST%\bin%_EXT%\desktop-integration\rpm
-mkdir: %_DEST%\bin%_EXT%\desktop-integration\deb
-mkdir: %_DEST%\bin%_EXT%\desktop-integration\pkg
+mkdir: %_DEST%\res\icons
+mkdir: %_DEST%\inc\icons
+mkdir: %_DEST%\bin\so
+mkdir: %_DEST%\bin\desktop-integration
+mkdir: %_DEST%\bin\desktop-integration\rpm
+mkdir: %_DEST%\bin\desktop-integration\deb
+mkdir: %_DEST%\bin\desktop-integration\pkg
-..\%__SRC%\misc\*.ico %_DEST%\res%_EXT%\icons\*.ico
-..\%__SRC%\misc\*.gif %_DEST%\res%_EXT%\icons\*.gif
-..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%\*.zip
-..\%__SRC%\bin\*.tar.gz %_DEST%\bin%_EXT%\*.tar.gz
-..\%__SRC%\bin\rpm\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\rpm\*.tar.gz
-..\%__SRC%\bin\deb\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\deb\*.tar.gz
-..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\pkg\*.tar.gz
+..\%__SRC%\misc\*.ico %_DEST%\res\icons\*.ico
+..\%__SRC%\misc\*.gif %_DEST%\res\icons\*.gif
+..\%__SRC%\bin\*.zip %_DEST%\bin\*.zip
+..\%__SRC%\bin\*.tar.gz %_DEST%\bin\*.tar.gz
+..\%__SRC%\bin\rpm\*.tar.gz %_DEST%\bin\desktop-integration\rpm\*.tar.gz
+..\%__SRC%\bin\deb\*.tar.gz %_DEST%\bin\desktop-integration\deb\*.tar.gz
+..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin\desktop-integration\pkg\*.tar.gz
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin%_EXT%\soffice.ico
+..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin\soffice.ico
-..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck%_EXT%\*.desktop
-..\%__SRC%\misc\PkgInfo %_DEST%\pck%_EXT%\PkgInfo
-..\%__SRC%\misc\Info.plist %_DEST%\pck%_EXT%\Info.plist
+..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck\*.desktop
+..\%__SRC%\misc\PkgInfo %_DEST%\pck\PkgInfo
+..\%__SRC%\misc\Info.plist %_DEST%\pck\Info.plist
diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index a824254..149f4bf 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -1,51 +1,51 @@
-..\%__SRC%\bin\cached*.dll %_DEST%\bin%_EXT%\cached*.dll
-..\%__SRC%\lib\libcached*.* %_DEST%\lib%_EXT%\libcached*.*
-..\%__SRC%\bin\cached*.map %_DEST%\bin%_EXT%\cached*.map
-..\%__SRC%\bin\cached*.sym %_DEST%\bin%_EXT%\cached*.sym
-..\source\cacher\cached.xml %_DEST%\xml%_EXT%\cached.xml
+..\%__SRC%\bin\cached*.dll %_DEST%\bin\cached*.dll
+..\%__SRC%\lib\libcached*.* %_DEST%\lib\libcached*.*
+..\%__SRC%\bin\cached*.map %_DEST%\bin\cached*.map
+..\%__SRC%\bin\cached*.sym %_DEST%\bin\cached*.sym
+..\source\cacher\cached.xml %_DEST%\xml\cached.xml
-..\%__SRC%\bin\srtrs*.dll %_DEST%\bin%_EXT%\srtrs*.dll
-..\%__SRC%\lib\libsrtrs*.* %_DEST%\lib%_EXT%\libsrtrs*.*
-..\%__SRC%\bin\srtrs*.map %_DEST%\bin%_EXT%\srtrs*.map
-..\%__SRC%\bin\srtrs*.sym %_DEST%\bin%_EXT%\srtrs*.sym
-..\source\sorter\srtrs.xml %_DEST%\xml%_EXT%\srtrs.xml
+..\%__SRC%\bin\srtrs*.dll %_DEST%\bin\srtrs*.dll
+..\%__SRC%\lib\libsrtrs*.* %_DEST%\lib\libsrtrs*.*
+..\%__SRC%\bin\srtrs*.map %_DEST%\bin\srtrs*.map
+..\%__SRC%\bin\srtrs*.sym %_DEST%\bin\srtrs*.sym
+..\source\sorter\srtrs.xml %_DEST%\xml\srtrs.xml
-..\%__SRC%\bin\ucb*.dll %_DEST%\bin%_EXT%\ucb*.dll
-..\%__SRC%\lib\libucb*.* %_DEST%\lib%_EXT%\libucb*.*
-..\%__SRC%\misc\ucb*.map %_DEST%\bin%_EXT%\ucb*.map
-..\%__SRC%\misc\ucb*.sym %_DEST%\bin%_EXT%\ucb*.sym
-..\source\core\ucb.xml %_DEST%\xml%_EXT%\ucb.xml
+..\%__SRC%\bin\ucb*.dll %_DEST%\bin\ucb*.dll
+..\%__SRC%\lib\libucb*.* %_DEST%\lib\libucb*.*
+..\%__SRC%\misc\ucb*.map %_DEST%\bin\ucb*.map
+..\%__SRC%\misc\ucb*.sym %_DEST%\bin\ucb*.sym
+..\source\core\ucb.xml %_DEST%\xml\ucb.xml
-..\%__SRC%\bin\ucp*.dll %_DEST%\bin%_EXT%\ucp*.dll
-..\%__SRC%\lib\libucp*.so %_DEST%\lib%_EXT%\libucp*.so
-..\%__SRC%\lib\libucp*.dylib %_DEST%\lib%_EXT%\libucp*.dylib
-..\%__SRC%\lib\ucp*.uno.so %_DEST%\lib%_EXT%\ucp*.uno.so
-..\%__SRC%\lib\ucp*.uno.dylib %_DEST%\lib%_EXT%\ucp*.uno.dylib
-..\%__SRC%\misc\ucp*.map %_DEST%\bin%_EXT%\ucp*.map
-..\%__SRC%\misc\ucp*.sym %_DEST%\bin%_EXT%\ucp*.sym
+..\%__SRC%\bin\ucp*.dll %_DEST%\bin\ucp*.dll
+..\%__SRC%\lib\libucp*.so %_DEST%\lib\libucp*.so
+..\%__SRC%\lib\libucp*.dylib %_DEST%\lib\libucp*.dylib
+..\%__SRC%\lib\ucp*.uno.so %_DEST%\lib\ucp*.uno.so
+..\%__SRC%\lib\ucp*.uno.dylib %_DEST%\lib\ucp*.uno.dylib
+..\%__SRC%\misc\ucp*.map %_DEST%\bin\ucp*.map
+..\%__SRC%\misc\ucp*.sym %_DEST%\bin\ucp*.sym
-..\%__SRC%\slb\odma_lib.lib %_DEST%\lib%_EXT%\odma_lib.lib
-..\source\ucp\odma\odma.h %_DEST%\inc%_EXT%\odma.h
-..\source\ucp\odma\odma_lib.hxx %_DEST%\inc%_EXT%\odma_lib.hxx
+..\%__SRC%\slb\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\source\ucp\odma\odma.h %_DEST%\inc\odma.h
+..\source\ucp\odma\odma_lib.hxx %_DEST%\inc\odma_lib.hxx
-..\source\ucp\file\ucpfile.xml %_DEST%\xml%_EXT%\ucpfile.xml
-..\source\ucp\ftp\ucpftp.xml %_DEST%\xml%_EXT%\ucpftp.xml
-..\source\ucp\hierarchy\ucphier.xml %_DEST%\xml%_EXT%\ucphier.xml
-..\source\ucp\package\ucppkg.xml %_DEST%\xml%_EXT%\ucppkg.xml
-..\source\ucp\webdav\ucpdav.xml %_DEST%\xml%_EXT%\ucpdav.xml
-..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml
-..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml%_EXT%\ucptdoc.xml
+..\source\ucp\file\ucpfile.xml %_DEST%\xml\ucpfile.xml
+..\source\ucp\ftp\ucpftp.xml %_DEST%\xml\ucpftp.xml
+..\source\ucp\hierarchy\ucphier.xml %_DEST%\xml\ucphier.xml
+..\source\ucp\package\ucppkg.xml %_DEST%\xml\ucppkg.xml
+..\source\ucp\webdav\ucpdav.xml %_DEST%\xml\ucpdav.xml
+..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml\ucpgvfs.xml
+..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml\ucptdoc.xml
-..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml%_EXT%\ucpgvfs.component
-..\%__SRC%\misc\ucpgio.component %_DEST%\xml%_EXT%\ucpgio.component
-..\%__SRC%\misc\cached1.component %_DEST%\xml%_EXT%\cached1.component
-..\%__SRC%\misc\srtrs1.component %_DEST%\xml%_EXT%\srtrs1.component
-..\%__SRC%\misc\ucb1.component %_DEST%\xml%_EXT%\ucb1.component
-..\%__SRC%\misc\ucpdav1.component %_DEST%\xml%_EXT%\ucpdav1.component
-..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml%_EXT%\ucpexpand1.component
-..\%__SRC%\misc\ucpext.component %_DEST%\xml%_EXT%\ucpext.component
-..\%__SRC%\misc\ucpfile1.component %_DEST%\xml%_EXT%\ucpfile1.component
-..\%__SRC%\misc\ucpftp1.component %_DEST%\xml%_EXT%\ucpftp1.component
-..\%__SRC%\misc\ucphier1.component %_DEST%\xml%_EXT%\ucphier1.component
-..\%__SRC%\misc\ucppkg1.component %_DEST%\xml%_EXT%\ucppkg1.component
-..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml%_EXT%\ucptdoc1.component
+..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml\ucpgvfs.component
+..\%__SRC%\misc\ucpgio.component %_DEST%\xml\ucpgio.component
+..\%__SRC%\misc\cached1.component %_DEST%\xml\cached1.component
+..\%__SRC%\misc\srtrs1.component %_DEST%\xml\srtrs1.component
+..\%__SRC%\misc\ucb1.component %_DEST%\xml\ucb1.component
+..\%__SRC%\misc\ucpdav1.component %_DEST%\xml\ucpdav1.component
+..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml\ucpexpand1.component
+..\%__SRC%\misc\ucpext.component %_DEST%\xml\ucpext.component
+..\%__SRC%\misc\ucpfile1.component %_DEST%\xml\ucpfile1.component
+..\%__SRC%\misc\ucpftp1.component %_DEST%\xml\ucpftp1.component
+..\%__SRC%\misc\ucphier1.component %_DEST%\xml\ucphier1.component
+..\%__SRC%\misc\ucppkg1.component %_DEST%\xml\ucppkg1.component
+..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml\ucptdoc1.component
diff --git a/uui/prj/d.lst b/uui/prj/d.lst
index 46b0118..4e01426 100644
--- a/uui/prj/d.lst
+++ b/uui/prj/d.lst
@@ -1,10 +1,10 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\uui*.dll %_DEST%\bin%_EXT%\uui*.dll
-..\%__SRC%\bin\uui*.res %_DEST%\bin%_EXT%\uui*.res
-..\%__SRC%\lib\libuui*.* %_DEST%\lib%_EXT%\libuui*.*
-..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\%__SRC%\bin\uui*.dll %_DEST%\bin\uui*.dll
+..\%__SRC%\bin\uui*.res %_DEST%\bin\uui*.res
+..\%__SRC%\lib\libuui*.* %_DEST%\lib\libuui*.*
+..\%__SRC%\lib\iuui.lib %_DEST%\lib\iuui.lib
-..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml
-..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component
+..\util\uui.xml %_DEST%\xml\uui.xml
+..\%__SRC%\misc\uui.component %_DEST%\xml\uui.component
diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst
index c317c4d..470676b 100644
--- a/vbahelper/prj/d.lst
+++ b/vbahelper/prj/d.lst
@@ -1 +1 @@
-..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx
+..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc\vbahelper\vbaeventshelperbase.hxx
diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst
index 740ff55..11b504a 100644
--- a/xmlhelp/prj/d.lst
+++ b/xmlhelp/prj/d.lst
@@ -1,12 +1,12 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\bin\HelpLinker* %_DEST%\bin%_EXT%
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
-..\util\ucpchelp.xml %_DEST%\xml%_EXT%\ucpchelp.xml
-..\util\*.xsl %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib
-..\%__SRC%\bin\helpxsl.zip %_DEST%\pck%_EXT%\helpxsl.zip
-..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml%_EXT%\LuceneHelpWrapper.component
-..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component
-..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.*
+..\%__SRC%\bin\HelpLinker* %_DEST%\bin
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.*
+..\%__SRC%\class\*.jar %_DEST%\bin\*.*
+..\util\ucpchelp.xml %_DEST%\xml\ucpchelp.xml
+..\util\*.xsl %_DEST%\bin\*.*
+..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib\ihelplinker.lib
+..\%__SRC%\bin\helpxsl.zip %_DEST%\pck\helpxsl.zip
+..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml\LuceneHelpWrapper.component
+..\%__SRC%\misc\tvhlp1.component %_DEST%\xml\tvhlp1.component
+..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml\ucpchelp1.component
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index 2f1ff7e..6a2447a 100644
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -1,14 +1,14 @@
-mkdir: %_DEST%\inc%_EXT%\xmlscript
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+mkdir: %_DEST%\inc\xmlscript
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx
-..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmldlg_imexp.hxx
-..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmllib_imexp.hxx
-..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmlmod_imexp.hxx
-..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
+..\inc\xmlscript\xml_helper.hxx %_DEST%\inc\xmlscript\xml_helper.hxx
+..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc\xmlscript\xmldlg_imexp.hxx
+..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc\xmlscript\xmllib_imexp.hxx
+..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc\xmlscript\xmlmod_imexp.hxx
+..\inc\xmlscript\xmlns.h %_DEST%\inc\xmlscript\xmlns.h
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
-..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
+..\dtd\*.dtd %_DEST%\bin\*.dtd
+..\%__SRC%\misc\xcr.component %_DEST%\xml\xcr.component
More information about the Libreoffice-commits
mailing list