ause117: #i110336# cleanup

2 files changed, 133 insertions, 172 deletions

diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 0eb4c76b625d..825f09b7a6d3 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -37,26 +37,26 @@ IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"
 PRODUCT_NAME=odkcommon
 PRODUCTZIPFILE=$(PRODUCT_NAME).zip
 
-DESTDIR=$(OUT)$/bin$/$(PRODUCT_NAME)
-DESTDIRBIN=$(DESTDIR)$/bin
-DESTDIRLIB=$(DESTDIR)$/lib
+DESTDIR=$(OUT)/bin/$(PRODUCT_NAME)
+DESTDIRBIN=$(DESTDIR)/bin
+DESTDIRLIB=$(DESTDIR)/lib
 DESTDIRDLL=$(DESTDIRLIB)
-DESTDIRIDL=$(DESTDIR)$/idl
-DESTDIRINC=$(DESTDIR)$/include
-DESTDIRJAR=$(DESTDIR)$/classes
-DESTDIRXML=$(DESTDIR)$/xml
-DESTDIRSETTINGS=$(DESTDIR)$/settings
-DESTDIREXAMPLES=$(DESTDIR)$/examples
-DESTDIRINC=$(DESTDIR)$/include
-DESTDIRCLASSES=$(DESTDIR)$/classes
-DESTDIRDOCU=$(DESTDIR)$/docs
-DESTDIRCOMMONDOCU=$(DESTDIRDOCU)$/common
-DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)$/ref
-DESTDIRDOCUIMAGES=$(DESTDIRDOCU)$/images
-DESTDIRCPPDOCU=$(DESTDIRDOCU)$/cpp
-DESTDIRGENCPPREF=$(DESTDIRDOCU)$/cpp$/ref
-DESTDIRJAVADOCU=$(DESTDIRDOCU)$/java
-DESTDIRGENJAVAREF=$(DESTDIRDOCU)$/java$/ref
+DESTDIRIDL=$(DESTDIR)/idl
+DESTDIRINC=$(DESTDIR)/include
+DESTDIRJAR=$(DESTDIR)/classes
+DESTDIRXML=$(DESTDIR)/xml
+DESTDIRSETTINGS=$(DESTDIR)/settings
+DESTDIREXAMPLES=$(DESTDIR)/examples
+DESTDIRINC=$(DESTDIR)/include
+DESTDIRCLASSES=$(DESTDIR)/classes
+DESTDIRDOCU=$(DESTDIR)/docs
+DESTDIRCOMMONDOCU=$(DESTDIRDOCU)/common
+DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)/ref
+DESTDIRDOCUIMAGES=$(DESTDIRDOCU)/images
+DESTDIRCPPDOCU=$(DESTDIRDOCU)/cpp
+DESTDIRGENCPPREF=$(DESTDIRDOCU)/cpp/ref
+DESTDIRJAVADOCU=$(DESTDIRDOCU)/java
+DESTDIRGENJAVAREF=$(DESTDIRDOCU)/java/ref
 
 BINOUT=$(SOLARBINDIR)
 INCOUT=$(SOLARINCDIR)
@@ -64,11 +64,11 @@ IDLOUT=$(SOLARIDLDIR)
 XMLOUT=$(SOLARXMLDIR)
 LIBOUT=$(SOLARLIBDIR)
 
-CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
+CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl
 CONVERTTAGFLAGNAME=converttags_html_files.flag
-CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
+CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME)
 
-MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc
+MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
 
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
 MY_COPY=$(GNUCOPY)
@@ -83,19 +83,22 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf
 .ENDIF
 .ENDIF
 
+MY_DELETE_RECURSIVE=rm -rf
+MY_TEXTCOPY=@cp 
+
 .IF "$(GUI)"=="WNT"
 #--------------------
 # WNT ONLY
 #--------------------
-MY_DELETE_RECURSIVE=+del /sxyf
-MY_TEXTCOPY=cat
+#MY_DELETE_RECURSIVE=+del /sxyf
+#MY_TEXTCOPY=cat
 
 MY_DLLPREFIX=
 MY_DLLPOSTFIX=.dll
-MY_DLLOUT=$(OUT)$/bin
+MY_DLLOUT=$(OUT)/bin
 EXEPOSTFIX=.exe
 DLLOUT=$(SOLARBINDIR)
-DESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp
+DESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp
 
 .IF "$(COM)"=="GCC"
 DESTPLATFROM=mingw
@@ -103,15 +106,15 @@ DESTPLATFROM=mingw
 DESTPLATFROM=windows
 .ENDIF
 DESTDIRDLL=$(DESTDIRBIN)
-DESTDIRCLI=$(DESTDIR)$/cli
+DESTDIRCLI=$(DESTDIR)/cli
 
 .ELSE
 #--------------------
-# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp
+# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp
 
 #--------------------
-MY_DELETE_RECURSIVE=rm -rf
-MY_TEXTCOPY= tr -d "\015"
+#MY_DELETE_RECURSIVE=rm -rf
+#MY_TEXTCOPY= tr -d "\015"
 
 MY_DLLPREFIX=lib
 .IF "$(OS)"=="MACOSX"
@@ -119,7 +122,7 @@ MY_DLLPOSTFIX=.dylib
 .ELSE
 MY_DLLPOSTFIX=.so
 .ENDIF
-MY_DLLOUT=$(OUT)$/lib
+MY_DLLOUT=$(OUT)/lib
 DLLOUT=$(SOLARLIBDIR)
 
 .IF "$(OS)$(CPU)"=="SOLARISS"
@@ -165,67 +168,60 @@ DESTPLATFROM=freebsd
 DESTPLATFROM=macosx
 .ENDIF
 
-#DESTDIRBIN=$(DESTDIR)$/$(DESTPLATFROM)$/bin
-#DESTDIRLIB=$(DESTDIR)$/$(DESTPLATFROM)$/lib
+#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin
+#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib
 #DESTDIRDLL=$(DESTDIRLIB)
 
 .ENDIF
 
-MY_TEXTCOPY_SOURCEPRE=<
-MY_TEXTCOPY_TARGETPRE=>
+#MY_TEXTCOPY_SOURCEPRE=<
+#MY_TEXTCOPY_TARGETPRE=>
 
 
 INCLUDETOPDIRLIST= \
-    $(INCOUT)$/sal \
-    $(INCOUT)$/salhelper \
-    $(INCOUT)$/rtl \
-    $(INCOUT)$/osl \
-    $(INCOUT)$/store \
-    $(INCOUT)$/typelib \
-    $(INCOUT)$/uno \
-    $(INCOUT)$/cppu \
-    $(INCOUT)$/cppuhelper \
-    $(INCOUT)$/bridges \
-    $(INCOUT)$/registry \
-    $(INCOUT)$/stl
+    $(INCOUT)/sal \
+    $(INCOUT)/salhelper \
+    $(INCOUT)/rtl \
+    $(INCOUT)/osl \
+    $(INCOUT)/store \
+    $(INCOUT)/typelib \
+    $(INCOUT)/uno \
+    $(INCOUT)/cppu \
+    $(INCOUT)/cppuhelper \
+    $(INCOUT)/bridges \
+    $(INCOUT)/registry \
+    $(INCOUT)/stl
 
 .IF "$(GUI)"=="WNT"
-INCLUDETOPDIRLIST += $(INCOUT)$/systools
+INCLUDETOPDIRLIST += $(INCOUT)/systools
 .ENDIF
 
-INCLUDEDIRLIST:={$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))}
+INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))}
 
 INCLUDEFILELIST=\
-    $(INCOUT)$/com$/sun$/star$/uno$/Any.h \
-    $(INCOUT)$/com$/sun$/star$/uno$/Any.hxx \
-    $(INCOUT)$/com$/sun$/star$/uno$/genfunc.h \
-    $(INCOUT)$/com$/sun$/star$/uno$/genfunc.hxx \
-    $(INCOUT)$/com$/sun$/star$/uno$/Reference.h \
-    $(INCOUT)$/com$/sun$/star$/uno$/Reference.hxx \
-    $(INCOUT)$/com$/sun$/star$/uno$/Sequence.h \
-    $(INCOUT)$/com$/sun$/star$/uno$/Sequence.hxx \
-    $(INCOUT)$/com$/sun$/star$/uno$/Type.h \
-    $(INCOUT)$/com$/sun$/star$/uno$/Type.hxx
-
-.IF "$(USE_SHELL)"=="4nt"
-# Quoted Open Bracket -QOB
-# Quoted Close Bracket -QCB
-QOB=(
-QCB=)
-.ELSE
+    $(INCOUT)/com/sun/star/uno/Any.h \
+    $(INCOUT)/com/sun/star/uno/Any.hxx \
+    $(INCOUT)/com/sun/star/uno/genfunc.h \
+    $(INCOUT)/com/sun/star/uno/genfunc.hxx \
+    $(INCOUT)/com/sun/star/uno/Reference.h \
+    $(INCOUT)/com/sun/star/uno/Reference.hxx \
+    $(INCOUT)/com/sun/star/uno/Sequence.h \
+    $(INCOUT)/com/sun/star/uno/Sequence.hxx \
+    $(INCOUT)/com/sun/star/uno/Type.h \
+    $(INCOUT)/com/sun/star/uno/Type.hxx
+
 QOB=\(
 QCB=\)
-.ENDIF
 
 INCLUDELIST:=\
-    {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \
+    {$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \
     $(INCLUDEFILELIST)
 
 SDK_CONTENT_CHECK_FILES= \
-    $(MISC)$/copying_files.txt
+    $(MISC)/copying_files.txt
 
 SDK_CHECK_FLAGS= \
-    $(MISC)$/checkbin.txt \
-    $(MISC)$/checkidl.txt \
-    $(MISC)$/checkinc.txt \
-    $(MISC)$/checkinc2.txt
+    $(MISC)/checkbin.txt \
+    $(MISC)/checkidl.txt \
+    $(MISC)/checkinc.txt \
+    $(MISC)/checkinc2.txt
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index cc80078de4a4..6c2fa72600a1 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -26,155 +26,124 @@
 #*************************************************************************
 
 
-$(DESTDIRDOCU)$/%.html : $(PRJ)$/docs$/%.html
+$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html
+$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIR)$/index.html : $(PRJ)$/index.html
+$(DESTDIR)/index.html : $(PRJ)/index.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRDOCU)$/%.css : $(PRJ)$/docs$/%.css
+$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/%
+$(DESTDIRDOCUIMAGES)/% : $(PRJ)/docs/images/%
     @@-rm -f $@
     $(MY_COPY) $< $@
 
-$(DESTDIR)$/configure : $(PRJ)$/configure
+$(DESTDIR)/configure : $(PRJ)/configure
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
+    $(MY_TEXTCOPY) $(PRJ)/configure $@
 
-$(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl
+$(DESTDIR)/configure.pl : $(PRJ)/configure.pl
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
+    $(MY_TEXTCOPY) $(PRJ)/configure.pl $@
 
-$(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess
+$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
+    $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@
 
-$(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub
+$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
+    $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@
 
-$(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix
+$(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
-
-#.IF "$(USE_SHELL)"=="4nt"
-#	$(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@
-#.ELSE
-#	$(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@
-#.ENDIF			
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in
+$(DESTDIR)/setsdkenv_unix.%.in : $(PRJ)/setsdkenv_unix.%.in
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 644 $@
-.ENDIF
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat
+$(DESTDIR)/setsdkenv_windows.bat : $(PRJ)/setsdkenv_windows.bat
     @@-rm -f $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@
-.ELSE
     $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@
-.ENDIF			
 
-$(DESTDIR)$/%.bat : $(PRJ)$/%.bat
+$(DESTDIR)/%.bat : $(PRJ)/%.bat
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIR)$/setsdkenv_windows.template : $(PRJ)$/setsdkenv_windows.template
+$(DESTDIR)/setsdkenv_windows.template : $(PRJ)/setsdkenv_windows.template
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIR)$/cfgWin.js : $(PRJ)$/cfgWin.js
+$(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/cfgWin.js $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $(PRJ)/cfgWin.js $@
 
-$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk
+$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk
     @@-rm -f $@
 .IF "$(COMEX)"=="7"
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@
 .ELSE
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 .ENDIF
 
-$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd
+$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
-$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml
+    $(MY_TEXTCOPY) $(XMLOUT)/module-description.dtd $@
+$(DESTDIRXML)/%.xml : $(XMLOUT)/%.xml
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX)
+$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)/%$(EXEPOSTFIX)
     @@-rm -f $@
-    $(GNUCOPY) $(BINOUT)$/$(@:f) $@
+    $(GNUCOPY) $(BINOUT)/$(@:f) $@
 
-$(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin
+$(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin
     @@-rm -f $@
-    $(GNUCOPY) $(BINOUT)$/$(@:f) $@
+    $(GNUCOPY) $(BINOUT)/$(@:f) $@
 
-$(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp
+$(DESTDIRBIN)/regcomp : $(BINOUT)/regcomp
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    -chmod 755 $@
-.ENDIF
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX)
+$(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) : $(BIN)/unoapploader$(EXEPOSTFIX)
     @@-rm -f $@
-    $(GNUCOPY) $(BIN)$/$(@:f) $@
+    $(GNUCOPY) $(BIN)/$(@:f) $@
 
 # special rule for special Java UNO native library
 # (used for all platforms but built only under windows;
 # otherwise provided in external)
-$(DESTDIRJAR)$/win$/unowinreg.dll : $(BIN)$/unowinreg.dll
+$(DESTDIRJAR)/win/unowinreg.dll : $(BIN)/unowinreg.dll
     @@-rm -f $@
     $(GNUCOPY) $< $@
 
-$(DESTDIRCLI)$/%.dll : $(BINOUT)$/%.dll
+$(DESTDIRCLI)/%.dll : $(BINOUT)/%.dll
     @@-rm -f $@
     $(GNUCOPY) $< $@
 
-$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX)
+$(DESTDIRDLL)/%$(MY_DLLPOSTFIX) : $(DLLOUT)/%$(MY_DLLPOSTFIX)
     @@-rm -f $@
-    $(GNUCOPY) $(DLLOUT)$/$(@:f) $@
+    $(GNUCOPY) $(DLLOUT)/$(@:f) $@
 
-$(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class
+$(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loader/%.class
     @@-$(RM) $(@:db).class
     $(COPY) $(<:db).class $(@:d)
 # deal with subclasses
     @@-$(RM) $(@:db)$(EMQ)$$*.class
     -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d)
 
-$(DESTDIRIDL)$/% : $(IDLOUT)$/%
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-    @touch $(IDL_DOCU_CLEANUP_FLAG)
+$(DESTDIRIDL)/% : $(IDLOUT)/%
+    $(MY_TEXTCOPY) $< $@
+#	@touch $(IDL_DOCU_CLEANUP_FLAG)
 
-$(DESTDIRINC)$/udkversion.mk :
+$(DESTDIRINC)/udkversion.mk :
     @@-rm -f $@
     @echo #UDK version number > $@
     @echo #major >> $@
@@ -184,38 +153,34 @@ $(DESTDIRINC)$/udkversion.mk :
     @echo #micro >> $@
     @echo UDK_MICRO=$(UDK_MICRO) >> $@
 
-$(DESTDIRINC)$/% : $(INCOUT)$/%
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+$(DESTDIRINC)/% : $(INCOUT)/%
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib
+$(DESTDIRLIB)/%.lib : $(LIBOUT)/%.lib
     @@-rm -f $@
-    $(GNUCOPY) $(LIBOUT)$/$(@:f) $@
+    $(GNUCOPY) $(LIBOUT)/$(@:f) $@
 
-$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
+$(DESTDIRLIB)/%.a : $(LIBOUT)/%.a
     @@-rm -f $@
-    $(GNUCOPY) $(LIBOUT)$/$(@:f) $@
+    $(GNUCOPY) $(LIBOUT)/$(@:f) $@
 
 $(DIR_CREATE_FLAG) :
-.IF "$(USE_SHELL)" != "4nt"
     $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
-.ELSE
-    $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) mkdir.exe -p && echo "dirs created" > $@ && touch $@
-.ENDIF
     $(DELAY) 2
 
-$(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def
+$(DESTDIRSETTINGS)/component.uno.def : $(PRJ)/settings/component.uno.def
     @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+    $(MY_TEXTCOPY) $< $@
 
-$(DESTDIRSETTINGS)$/component.uno.map : $(SOLARENV)$/bin$/addsym.awk $(SOLARENV)$/src$/component.map
+$(DESTDIRSETTINGS)/component.uno.map : $(SOLARENV)/bin/addsym.awk $(SOLARENV)/src/component.map
     @@-$(RM) -f $@
 .IF "$(COMID)"=="gcc3"
-    tr -d "\015" < $(SOLARENV)$/src$/component.map | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SOLARENV)/src/component.map | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .IF "$(OS)"=="MACOSX"
-    tr -d "\015" < $(SOLARENV)$/src$/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*$//' > $@
+    tr -d "\015" < $(SOLARENV)/src/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*//' > $@
 .ENDIF
 .ELSE           # "$(COMID)"=="gcc3"
-    tr -d "\015" < $(SOLARENV)$/src$/component.map > $@
+    tr -d "\015" < $(SOLARENV)/src/component.map > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod 664 $@