Drop %_EXT% which was always empty

32 files changed, 252 insertions, 252 deletions

diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst
index 5991e2066540..9690bd4d2cd4 100644
--- a/Mesa/prj/d.lst
+++ b/Mesa/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\GL
+mkdir: %_DEST%\inc\GL
 
-..\inc\*.h %_DEST%\inc%_EXT%\GL\*.h
+..\inc\*.h %_DEST%\inc\GL\*.h
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
index 78396a65f9e4..1652d1f97cb5 100644
--- a/afms/prj/d.lst
+++ b/afms/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\pck%_EXT%
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+mkdir: %_DEST%\pck
+..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
 
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
index ef6dd4613f43..8d05687ba9f1 100644
--- a/apple_remote/prj/d.lst
+++ b/apple_remote/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\apple_remote
-..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\*
+mkdir: %_DEST%\inc\apple_remote
+..\inc\*.h %_DEST%\inc\apple_remote\*
 
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
 
diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst
index 661462345eec..ea4006c5d6fc 100644
--- a/beanshell/prj/d.lst
+++ b/beanshell/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar
+..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin\bsh.jar
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 29dac2bc6ed7..28b70950dd11 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -1,36 +1,36 @@
-mkdir: %_DEST%\inc%_EXT%\cppunit
-..\%__SRC%\inc\cppunit\*.h %_DEST%\inc%_EXT%\cppunit\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\config
-..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc%_EXT%\cppunit\config\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\extensions
-..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc%_EXT%\cppunit\extensions\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\plugin
-..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc%_EXT%\cppunit\plugin\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\portability
-..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc%_EXT%\cppunit\portability\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\tools
-..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc%_EXT%\cppunit\tools\*.h
-mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text
-..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc%_EXT%\cppunit\ui\text\*.h
+mkdir: %_DEST%\inc\cppunit
+..\%__SRC%\inc\cppunit\*.h %_DEST%\inc\cppunit\*.h
+mkdir: %_DEST%\inc\cppunit\config
+..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc\cppunit\config\*.h
+mkdir: %_DEST%\inc\cppunit\extensions
+..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc\cppunit\extensions\*.h
+mkdir: %_DEST%\inc\cppunit\plugin
+..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc\cppunit\plugin\*.h
+mkdir: %_DEST%\inc\cppunit\portability
+..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc\cppunit\portability\*.h
+mkdir: %_DEST%\inc\cppunit\tools
+..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc\cppunit\tools\*.h
+mkdir: %_DEST%\inc\cppunit\ui\text
+..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc\cppunit\ui\text\*.h
 
-..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll
-..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib
+..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll
+..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib
 
-..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll
-..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a
+..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin\cygcppunit-1-12-1.dll
+..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a
 
-..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib
+..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib
+symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib
 
-..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so
+..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1
+symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so
 
-..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so
+..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit-1.12.so.1.0
+symlink: %_DEST%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit.so
 
-..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a
-symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a
+..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit-1.12.a
+symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
 
-..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester
-..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe
-..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe
+..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
+..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
+..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
diff --git a/epm/prj/d.lst b/epm/prj/d.lst
index 5eea5f2f3bad..315d3d175552 100644
--- a/epm/prj/d.lst
+++ b/epm/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\bin\epm %_DEST%\bin%_EXT%\epm
-..\%__SRC%\bin\epminstall %_DEST%\bin%_EXT%\epminstall
-..\%__SRC%\bin\mkepmlist %_DEST%\bin%_EXT%\mkepmlist
+..\%__SRC%\bin\epm %_DEST%\bin\epm
+..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall
+..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 7809c07a6264..55e10bc21782 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -1,57 +1,57 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\glibc
-mkdir: %_DEST%\inc%_EXT%\external\mingw
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include\atl
-mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\glibc
+mkdir: %_DEST%\inc\external\mingw
+mkdir: %_DEST%\inc\external\mingw\include
+mkdir: %_DEST%\inc\external\mingw\include\atl
+mkdir: %_DEST%\inc\external\mingw\include\sys
 
-..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h
-..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h
+..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
+..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
 
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
-..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
+..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib\gnu_getopt.lib
+..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib\libgnu_getopt.a
+..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib\libgnu_getopt_static.a
 
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h
 
-..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
-..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
-..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
+..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\*
+..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\*
+..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc\external\mingw\include\sys\*
 
-..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.*
 
-..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
-..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.*
 
-..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll
+..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
 
-..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll
+..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll
 
-..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\msvcm80*.dll %_DEST%\bin
+..\msvcp80\msvcp80*.dll %_DEST%\bin
+..\msvcp80\msvcr80*.dll %_DEST%\bin
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin\Microsoft.VC80.DebugCRT.manifest
 
-..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.CRT.manifest
-..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
-..\msm90\*.msm %_DEST%\bin%_EXT%
+..\msvcp90\msvcm90*.dll %_DEST%\bin
+..\msvcp90\msvcp90*.dll %_DEST%\bin
+..\msvcp90\msvcr90*.dll %_DEST%\bin
+..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
+..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
+..\msm90\*.msm %_DEST%\bin
 
-..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
+..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll
 
-..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe
-..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe
+..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe
+..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe
 
-..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
-..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
-..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll
+..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll
+..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll
+..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll
 
-..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.*
 
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
 
 linklib: libgcc_s.*.*
 
diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst
index 8801f4fecfc8..d432e98eefe5 100644
--- a/hsqldb/prj/d.lst
+++ b/hsqldb/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar
+..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin\hsqldb.jar
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
index 4b7ff0b35e2e..4758ed754bcb 100644
--- a/hyphen/prj/d.lst
+++ b/hyphen/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\slb\hyphen.lib     %_DEST%\lib%_EXT%\hyphen.lib
+..\%__SRC%\slb\hyphen.lib     %_DEST%\lib\hyphen.lib
 
-..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h
-..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
-..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic
+..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h
+..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
+..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
diff --git a/icc/prj/d.lst b/icc/prj/d.lst
index 864e9473792b..553de38b4fad 100644
--- a/icc/prj/d.lst
+++ b/icc/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\icc
-mkdir: %_DEST%\inc%_EXT%\external\icc
+mkdir: %_DEST%\inc\icc
+mkdir: %_DEST%\inc\external\icc
 
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc%_EXT%\icc\sRGB*.hxx
+..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
 
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 0e7f5636bdc0..9e060aefad8e 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -1,12 +1,12 @@
 
-..\%__SRC%\lib\lib*.*        %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\ilib*.*        %_DEST%\lib%_EXT%\ilib*.*
-..\%__SRC%\bin\l*.dll         %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.*        %_DEST%\lib\lib*.*
+..\%__SRC%\lib\ilib*.*        %_DEST%\lib\ilib*.*
+..\%__SRC%\bin\l*.dll         %_DEST%\bin\*.dll
 
-mkdir: %_DEST%\inc%_EXT%\libtextcat
-..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc%_EXT%\libtextcat\*.h
+mkdir: %_DEST%\inc\libtextcat
+..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc\libtextcat\*.h
 
 # data for language guessing
-..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck%_EXT%\fpdb.conf
-..\data\new_fingerprints\lm\*.lm   %COMMON_DEST%\pck%_EXT%\*.lm
+..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
+..\data\new_fingerprints\lm\*.lm   %COMMON_DEST%\pck\*.lm
 
diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst
index 070c6fbc0972..f03b25b91252 100644
--- a/libvisio/prj/d.lst
+++ b/libvisio/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc%_EXT%\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc%_EXT%\libvisio\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libvisio
+..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio
+..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
index ef6944359362..f891f3b94f3d 100644
--- a/libwpd/prj/d.lst
+++ b/libwpd/prj/d.lst
@@ -1,15 +1,15 @@
-mkdir: %_DEST%\inc%_EXT%\libwpd
-mkdir: %_DEST%\inc%_EXT%\libwpd-stream
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc%_EXT%\libwpd-stream\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwpd
+mkdir: %_DEST%\inc\libwpd-stream
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index 2093e0d69a26..a6a84a396e28 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,6 +1,6 @@
-mkdir: %_DEST%\inc%_EXT%\libwpg
-..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwpg
+..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index a71985a7ae1a..3923a1834f85 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\libwps
-..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
+mkdir: %_DEST%\inc\libwps
+..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\
+..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libxmlsec/prj/d.lst b/libxmlsec/prj/d.lst
index 064bd9e6bfc4..21896b57657b 100644
--- a/libxmlsec/prj/d.lst
+++ b/libxmlsec/prj/d.lst
@@ -1,9 +1,9 @@
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec\nss
-mkdir: %_DEST%\inc%_EXT%\external\xmlsec\mscrypto
-..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc%_EXT%\external\xmlsec\*.h
-..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc%_EXT%\external\xmlsec\nss\*.h
-..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc%_EXT%\external\xmlsec\mscrypto\*.h
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+mkdir: %_DEST%\inc\external\xmlsec
+mkdir: %_DEST%\inc\external\xmlsec\nss
+mkdir: %_DEST%\inc\external\xmlsec\mscrypto
+..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc\external\xmlsec\*.h
+..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc\external\xmlsec\nss\*.h
+..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc\external\xmlsec\mscrypto\*.h
+..\%__SRC%\lib\lib*.a %_DEST%\lib
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\bin\*.dll %_DEST%\bin
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index cb52247df495..68001dc50b93 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -1,10 +1,10 @@
-mkdir: %_DEST%\inc%_EXT%\lpsolve
+mkdir: %_DEST%\inc\lpsolve
 
-..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\*
-..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so
-..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
-..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib
-..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib%_EXT%\liblpsolve55.a
-..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
-..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
+..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
+..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
+..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
+..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
+..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
+..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
 
diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst
index 553fc44cb167..97c896802d5e 100644
--- a/lucene/prj/d.lst
+++ b/lucene/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\lucene
-..\%__SRC%\bin\lucene-*.jar %_DEST%\bin%_EXT%\lucene-*.jar
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\lucene
+..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
index 9c4dd58a9ee5..62d44f347ac2 100644
--- a/mdds/prj/d.lst
+++ b/mdds/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\inc%_EXT%\mdds
-mkdir: %_DEST%\inc%_EXT%\mdds\hash_container
+mkdir: %_DEST%\inc\mdds
+mkdir: %_DEST%\inc\mdds\hash_container
 
-..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
-..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc%_EXT%\mdds\hash_container
+..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds
+..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container
 
 
diff --git a/mysqlcppconn/prj/d.lst b/mysqlcppconn/prj/d.lst
index 7a32571f9aea..5541358426a6 100644
--- a/mysqlcppconn/prj/d.lst
+++ b/mysqlcppconn/prj/d.lst
@@ -1,15 +1,15 @@
 # mirror the dir structure a make install would create
-mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
-mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn
+mkdir: %_DEST%\inc\mysqlcppconn
+mkdir: %_DEST%\inc\mysqlcppconn\cppconn
 
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h
-..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h
+..\%__SRC%\inc\*.h %_DEST%\inc\mysqlcppconn\*.h
+..\%__SRC%\inc\cppconn\*.h %_DEST%\inc\mysqlcppconn\cppconn\*.h
 
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
 
- ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%
+ ..\%__SRC%\lib\lib*.so* %_DEST%\lib
+..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.dylib.* %_DEST%\lib\*.dylib.*
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\lib\i*.lib %_DEST%\lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index 417855e879d8..375161fdf341 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\slb\libmythes.lib     %_DEST%\lib%_EXT%\libmythes.lib
+..\%__SRC%\slb\libmythes.lib     %_DEST%\lib\libmythes.lib
 
-..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
-..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
-..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
-..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin%_EXT%\th_gen_idx.pl
+..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx
+..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
+..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
+..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl
 
diff --git a/np_sdk/prj/d.lst b/np_sdk/prj/d.lst
index eaad1f5d3328..cfd2429a542d 100644
--- a/np_sdk/prj/d.lst
+++ b/np_sdk/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\inc%_EXT%\npsdk
+mkdir: %_DEST%\inc\npsdk
 
-..\mozsrc\*.h %_DEST%\inc%_EXT%\npsdk\*.h
+..\mozsrc\*.h %_DEST%\inc\npsdk\*.h
 
-..\%__SRC%\slo\npunix.o %_DEST%\lib%_EXT%\npunix.o
-..\%__SRC%\slo\npunix.obj %_DEST%\lib%_EXT%\npunix.obj
-..\%__SRC%\slo\npwin.obj %_DEST%\lib%_EXT%\npwin.obj
+..\%__SRC%\slo\npunix.o %_DEST%\lib\npunix.o
+..\%__SRC%\slo\npunix.obj %_DEST%\lib\npunix.obj
+..\%__SRC%\slo\npwin.obj %_DEST%\lib\npwin.obj
diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst
index 72065853d7a0..109bbaab4845 100644
--- a/openssl/prj/d.lst
+++ b/openssl/prj/d.lst
@@ -1,11 +1,11 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\openssl
-..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl
-..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib
-..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
-..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
-..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\openssl
+..\version.mk %_DEST%\inc\external\openssl\version.mk
+..\%__SRC%\inc\*.h %_DEST%\inc\external\openssl
+..\%__SRC%\lib\ssleay32.lib %_DEST%\lib\ssleay32.lib
+..\%__SRC%\bin\ssleay32.dll %_DEST%\bin\ssleay32.dll
+..\%__SRC%\lib\libeay32.lib %_DEST%\lib\libeay32.lib
+..\%__SRC%\bin\libeay32.dll %_DEST%\bin\libeay32.dll
+..\%__SRC%\lib\libcrypto.a %_DEST%\lib\libcrypto.a
+..\%__SRC%\lib\libssl.a %_DEST%\lib\libssl.a
  
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index f96f3a516fff..20bae4d8cc93 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,19 +1,19 @@
-mkdir: %_DEST%\inc%_EXT%\external
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
-..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0
-symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so
-..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib
-symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
-..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk
+mkdir: %_DEST%\inc\external
+..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
+..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1
+symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so
+..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib
+symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib
+..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1
+symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so
+..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib
+symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib
+..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0
+symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so
+..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib
+symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\lib\*.a %_DEST%\lib
+..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a
+..\%__SRC%\bin\*.dll %_DEST%\bin
+..\redlandversion.mk %_DEST%\inc\redlandversion.mk
diff --git a/rhino/prj/d.lst b/rhino/prj/d.lst
index 8fb6716524c8..b98f6b7e73a6 100644
--- a/rhino/prj/d.lst
+++ b/rhino/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin%_EXT%\js.jar
+..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin\js.jar
diff --git a/sane/prj/d.lst b/sane/prj/d.lst
index ee8c0c67b682..f59282160ddb 100644
--- a/sane/prj/d.lst
+++ b/sane/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\sane
-..\inc\sane.h %_DEST%\inc%_EXT%\external\sane\sane.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\sane
+..\inc\sane.h %_DEST%\inc\external\sane\sane.h
diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst
index ca4fe7a6fda6..31d61b0d507d 100644
--- a/translate_toolkit/prj/d.lst
+++ b/translate_toolkit/prj/d.lst
@@ -1,35 +1,35 @@
-mkdir: %_DEST%\bin%_EXT%\translate
-mkdir: %_DEST%\bin%_EXT%\translate\convert
-mkdir: %_DEST%\bin%_EXT%\translate\filters
-mkdir: %_DEST%\bin%_EXT%\translate\lang
-mkdir: %_DEST%\bin%_EXT%\translate\misc
-mkdir: %_DEST%\bin%_EXT%\translate\misc\typecheck
-mkdir: %_DEST%\bin%_EXT%\translate\storage
-mkdir: %_DEST%\bin%_EXT%\translate\storage\placeables
-mkdir: %_DEST%\bin%_EXT%\translate\storage\versioncontrol
-mkdir: %_DEST%\bin%_EXT%\translate\storage\xml_extract
-mkdir: %_DEST%\bin%_EXT%\translate\search
-mkdir: %_DEST%\bin%_EXT%\translate\search\indexing
-mkdir: %_DEST%\bin%_EXT%\translate\services
-mkdir: %_DEST%\bin%_EXT%\translate\share
-mkdir: %_DEST%\bin%_EXT%\translate\share\langmodels
-mkdir: %_DEST%\bin%_EXT%\translate\tools
+mkdir: %_DEST%\bin\translate
+mkdir: %_DEST%\bin\translate\convert
+mkdir: %_DEST%\bin\translate\filters
+mkdir: %_DEST%\bin\translate\lang
+mkdir: %_DEST%\bin\translate\misc
+mkdir: %_DEST%\bin\translate\misc\typecheck
+mkdir: %_DEST%\bin\translate\storage
+mkdir: %_DEST%\bin\translate\storage\placeables
+mkdir: %_DEST%\bin\translate\storage\versioncontrol
+mkdir: %_DEST%\bin\translate\storage\xml_extract
+mkdir: %_DEST%\bin\translate\search
+mkdir: %_DEST%\bin\translate\search\indexing
+mkdir: %_DEST%\bin\translate\services
+mkdir: %_DEST%\bin\translate\share
+mkdir: %_DEST%\bin\translate\share\langmodels
+mkdir: %_DEST%\bin\translate\tools
 
-..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin%_EXT%\translate\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin%_EXT%\translate\convert\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin%_EXT%\translate\filters\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin%_EXT%\translate\lang\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin%_EXT%\translate\misc\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin%_EXT%\translate\misc/typecheck\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin%_EXT%\translate\storage\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin%_EXT%\translate\storage/placeables\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin%_EXT%\translate\storage/versioncontrol\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin%_EXT%\translate\storage/xml_extract\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin%_EXT%\translate\search\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin%_EXT%\translate\search/indexing\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin%_EXT%\translate\services\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin%_EXT%\translate\share\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin%_EXT%\translate\share\langmodels\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin%_EXT%\translate\tools\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po  %_DEST%\bin%_EXT%\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo  %_DEST%\bin%_EXT%\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin\translate\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin\translate\convert\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin\translate\filters\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin\translate\lang\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin\translate\misc\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin\translate\misc/typecheck\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin\translate\storage\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin\translate\storage/placeables\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin\translate\storage/versioncontrol\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin\translate\storage/xml_extract\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin\translate\search\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin\translate\search/indexing\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin\translate\services\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin\translate\share\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin\translate\share\langmodels\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin\translate\tools\*
+..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po  %_DEST%\bin\*
+..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo  %_DEST%\bin\*
diff --git a/twain/prj/d.lst b/twain/prj/d.lst
index e26c5db47092..0827b03d1cd9 100644
--- a/twain/prj/d.lst
+++ b/twain/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\twain
-..\%__SRC%\inc\twain.h %_DEST%\inc%_EXT%\external\twain\twain.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\twain
+..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h
diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst
index 2825e1cad557..6b3fa9465c97 100644
--- a/unixODBC/prj/d.lst
+++ b/unixODBC/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\odbc
-..\inc\*.h %_DEST%\inc%_EXT%\external\odbc\*.h
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\odbc
+..\inc\*.h %_DEST%\inc\external\odbc\*.h
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
index 395b3e4fb520..ddf8fafb24a1 100644
--- a/vigra/prj/d.lst
+++ b/vigra/prj/d.lst
@@ -1,3 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\vigra
+mkdir: %_DEST%\inc\vigra
 
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc%_EXT%\vigra\*.hxx
+..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst
index ca96875f22c2..d3c8c6a5918b 100644
--- a/x11_extensions/prj/d.lst
+++ b/x11_extensions/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\X11
-mkdir: %_DEST%\inc%_EXT%\X11\extensions
+mkdir: %_DEST%\inc\X11
+mkdir: %_DEST%\inc\X11\extensions
 
-..\inc\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h
+..\inc\*.h %_DEST%\inc\X11\extensions\*.h
 
diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst
index fec9689f921c..ee5b0e21e9ae 100644
--- a/xsltml/prj/d.lst
+++ b/xsltml/prj/d.lst
@@ -1,6 +1,6 @@
-mkdir: %_DEST%\bin%_EXT%\xslt
-mkdir: %_DEST%\bin%_EXT%\xslt\export
-mkdir: %_DEST%\bin%_EXT%\xslt\export\xsltml
+mkdir: %_DEST%\bin\xslt
+mkdir: %_DEST%\bin\xslt\export
+mkdir: %_DEST%\bin\xslt\export\xsltml
 
-..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin%_EXT%\xslt\export\xsltml\*.xsl
+..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl