ause117: #i110336# cleanup

1 files changed, 97 insertions, 97 deletions

diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 5396496e1a3a..3d73d4d1b63f 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -25,149 +25,149 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=../..
 PRJNAME=odk
 TARGET=copying
 
 #----------------------------------------------------------------
 .INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
+.INCLUDE: $(PRJ)/util/makefile.pmk
 #----------------------------------------------------------------
 
-IDLLIST:={$(subst,/,$/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))}
+IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))}
 DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))}
 
 DESTINCLUDELIST={$(subst,$(SOLARINCDIR),$(DESTDIRINC) $(INCLUDELIST))}
-DESTINCLUDELIST+=$(DESTDIRINC)$/udkversion.mk
+DESTINCLUDELIST+=$(DESTDIRINC)/udkversion.mk
 
 DESTINCDIRLIST={$(subst,$(INCOUT),$(DESTDIRINC) $(INCLUDEDIRLIST))}
 
-IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)$/module-ix.html
-IDL_DOCU_CLEANUP_FLAG = $(MISC)$/idl_docu_cleanup.flag
+IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)/module-ix.html
+IDL_DOCU_CLEANUP_FLAG = $(MISC)/idl_docu_cleanup.flag
 
 IDL_CHAPTER_REFS=idl_chapter_refs.txt
 
 EXELIST = \
-    $(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/regcompare$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/idlcpp$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/idlc$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/javamaker$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/autodoc$(EXEPOSTFIX) \
-    $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) \
-    $(DESTDIRBIN)$/uno-skeletonmaker$(EXEPOSTFIX)
+    $(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) 	\
+    $(DESTDIRBIN)/regcompare$(EXEPOSTFIX) 	\
+    $(DESTDIRBIN)/idlcpp$(EXEPOSTFIX) 	\
+    $(DESTDIRBIN)/idlc$(EXEPOSTFIX) 	\
+    $(DESTDIRBIN)/javamaker$(EXEPOSTFIX) 	\
+    $(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \
+    $(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) \
+    $(DESTDIRBIN)/uno-skeletonmaker$(EXEPOSTFIX)
 
 .IF "$(GUI)"=="WNT"
 EXELIST += \
-    $(DESTDIRBIN)$/climaker$(EXEPOSTFIX)
+    $(DESTDIRBIN)/climaker$(EXEPOSTFIX)
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
 CLILIST = \
-    $(DESTDIRCLI)$/cli_basetypes.dll 	\
-    $(DESTDIRCLI)$/cli_uretypes.dll 	\
-    $(DESTDIRCLI)$/cli_oootypes.dll 	\
-    $(DESTDIRCLI)$/cli_ure.dll 	\
-    $(DESTDIRCLI)$/cli_cppuhelper.dll
+    $(DESTDIRCLI)/cli_basetypes.dll 	\
+    $(DESTDIRCLI)/cli_uretypes.dll 	\
+    $(DESTDIRCLI)/cli_oootypes.dll 	\
+    $(DESTDIRCLI)/cli_ure.dll 	\
+    $(DESTDIRCLI)/cli_cppuhelper.dll
 .ENDIF
 
 
 .IF "$(GUI)"=="WNT"
 LIBLIST = \
-    $(DESTDIRLIB)$/istore.lib 	\
-    $(DESTDIRLIB)$/ireg.lib 	\
-    $(DESTDIRLIB)$/isal.lib 	\
-    $(DESTDIRLIB)$/isalhelper.lib 	\
-    $(DESTDIRLIB)$/icppu.lib 	\
-    $(DESTDIRLIB)$/icppuhelper.lib 	\
-    $(DESTDIRLIB)$/irmcxt.lib \
-    $(DESTDIRLIB)$/ipurpenvhelper3MSC.lib
+    $(DESTDIRLIB)/istore.lib 	\
+    $(DESTDIRLIB)/ireg.lib 	\
+    $(DESTDIRLIB)/isal.lib 	\
+    $(DESTDIRLIB)/isalhelper.lib 	\
+    $(DESTDIRLIB)/icppu.lib 	\
+    $(DESTDIRLIB)/icppuhelper.lib 	\
+    $(DESTDIRLIB)/irmcxt.lib \
+    $(DESTDIRLIB)/ipurpenvhelper3MSC.lib
 
 .IF "$(COMEX)"=="8"
-    LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib
+    LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib
 .ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12" 
-    LIBLIST += $(DESTDIRLIB)$/stlport_vc71.lib
+    LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib
 .ELSE
-    LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
+    LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib
 .ENDIF
 .ENDIF
 
 .IF "$(OS)"=="LINUX"
-    LIBLIST = $(DESTDIRLIB)$/libsalcpprt.a
+    LIBLIST = $(DESTDIRLIB)/libsalcpprt.a
 .ENDIF
 
 # note, that inner class files are copied implicitly
 DESTCLASSESLIST= \
-    $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader.class \
-    $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder.class \
-    $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKey.class \
-    $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKeyException.class
-#	$(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader$$CustomURLClassLoader.class \
-#	$(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder$$StreamGobbler.class \
+    $(DESTDIRJAR)/com/sun/star/lib/loader/Loader.class \
+    $(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder.class \
+    $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKey.class \
+    $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKeyException.class
+#	$(DESTDIRJAR)/com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \
+#	$(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \
 
 SETTINGSLIST= \
-    $(DESTDIRSETTINGS)$/settings.mk \
-    $(DESTDIRSETTINGS)$/std.mk \
-    $(DESTDIRSETTINGS)$/stdtarget.mk \
-    $(DESTDIRSETTINGS)$/dk.mk
+    $(DESTDIRSETTINGS)/settings.mk \
+    $(DESTDIRSETTINGS)/std.mk \
+    $(DESTDIRSETTINGS)/stdtarget.mk \
+    $(DESTDIRSETTINGS)/dk.mk
 
 
 .IF "$(GUI)"=="WNT"
-SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.def
+SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
-SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.map
+SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map
 .ENDIF
 
 
 DOCUHTMLFILES+= \
-    $(DESTDIR)$/index.html \
-    $(DESTDIRDOCU)$/tools.html \
-    $(DESTDIRDOCU)$/notsupported.html \
-    $(DESTDIRDOCU)$/install.html \
-    $(DESTDIREXAMPLES)$/examples.html \
-    $(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html
+    $(DESTDIR)/index.html \
+    $(DESTDIRDOCU)/tools.html \
+    $(DESTDIRDOCU)/notsupported.html \
+    $(DESTDIRDOCU)/install.html \
+    $(DESTDIREXAMPLES)/examples.html \
+    $(DESTDIREXAMPLES)/DevelopersGuide/examples.html
 
 DOCUFILES= \
     $(DOCUHTMLFILES) \
-    $(DESTDIRDOCU)$/sdk_styles.css \
-    $(DESTDIRGENIDLREF)$/idl.css \
-    $(DESTDIRDOCUIMAGES)$/nada.gif \
-    $(DESTDIRDOCUIMAGES)$/arrow-2.gif \
-    $(DESTDIRDOCUIMAGES)$/bluball.gif \
-    $(DESTDIRDOCUIMAGES)$/so-main-app_32.png \
-    $(DESTDIRDOCUIMAGES)$/ooo-main-app_32.png \
-    $(DESTDIRDOCUIMAGES)$/arrow-1.gif \
-    $(DESTDIRDOCUIMAGES)$/arrow-3.gif \
-    $(DESTDIRDOCUIMAGES)$/bg_table.gif \
-    $(DESTDIRDOCUIMAGES)$/bg_table2.gif \
-    $(DESTDIRDOCUIMAGES)$/bg_table3.gif \
-    $(DESTDIRDOCUIMAGES)$/nav_down.png \
-    $(DESTDIRDOCUIMAGES)$/nav_home.png \
-    $(DESTDIRDOCUIMAGES)$/nav_left.png \
-    $(DESTDIRDOCUIMAGES)$/nav_right.png \
-    $(DESTDIRDOCUIMAGES)$/nav_up.png \
-    $(DESTDIRDOCUIMAGES)$/sdk_head-1.gif \
-    $(DESTDIRDOCUIMAGES)$/sdk_head-2.gif \
-    $(DESTDIRDOCUIMAGES)$/sdk_head-3.gif \
-    $(DESTDIRDOCUIMAGES)$/sdk_line-1.gif \
-    $(DESTDIRDOCUIMAGES)$/sdk_line-2.gif
+    $(DESTDIRDOCU)/sdk_styles.css \
+    $(DESTDIRGENIDLREF)/idl.css \
+    $(DESTDIRDOCUIMAGES)/nada.gif \
+    $(DESTDIRDOCUIMAGES)/arrow-2.gif \
+    $(DESTDIRDOCUIMAGES)/bluball.gif \
+    $(DESTDIRDOCUIMAGES)/so-main-app_32.png \
+    $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \
+    $(DESTDIRDOCUIMAGES)/arrow-1.gif \
+    $(DESTDIRDOCUIMAGES)/arrow-3.gif \
+    $(DESTDIRDOCUIMAGES)/bg_table.gif \
+    $(DESTDIRDOCUIMAGES)/bg_table2.gif \
+    $(DESTDIRDOCUIMAGES)/bg_table3.gif \
+    $(DESTDIRDOCUIMAGES)/nav_down.png \
+    $(DESTDIRDOCUIMAGES)/nav_home.png \
+    $(DESTDIRDOCUIMAGES)/nav_left.png \
+    $(DESTDIRDOCUIMAGES)/nav_right.png \
+    $(DESTDIRDOCUIMAGES)/nav_up.png \
+    $(DESTDIRDOCUIMAGES)/sdk_head-1.gif \
+    $(DESTDIRDOCUIMAGES)/sdk_head-2.gif \
+    $(DESTDIRDOCUIMAGES)/sdk_head-3.gif \
+    $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \
+    $(DESTDIRDOCUIMAGES)/sdk_line-2.gif
 
 .IF "$(GUI)"=="UNX"
 INSTALLSCRIPT= \
-    $(DESTDIR)$/config.guess \
-    $(DESTDIR)$/config.sub \
-    $(DESTDIR)$/configure.pl \
-    $(DESTDIR)$/setsdkenv_unix \
-    $(DESTDIR)$/setsdkenv_unix.sh.in \
-    $(DESTDIR)$/setsdkenv_unix.csh.in
+    $(DESTDIR)/config.guess \
+    $(DESTDIR)/config.sub \
+    $(DESTDIR)/configure.pl \
+    $(DESTDIR)/setsdkenv_unix \
+    $(DESTDIR)/setsdkenv_unix.sh.in \
+    $(DESTDIR)/setsdkenv_unix.csh.in
 .ELSE
 INSTALLSCRIPT= \
-    $(DESTDIR)$/setsdkenv_windows.bat \
-    $(DESTDIR)$/setsdkenv_windows.template \
-    $(DESTDIR)$/setsdkname.bat \
-    $(DESTDIR)$/cfgWin.js
+    $(DESTDIR)/setsdkenv_windows.bat \
+    $(DESTDIR)/setsdkenv_windows.template \
+    $(DESTDIR)/setsdkname.bat \
+    $(DESTDIR)/cfgWin.js
 .ENDIF
 
 DIR_FILE_LIST=\
@@ -184,25 +184,25 @@ DIR_FILE_LIST=\
     $(CONVERTTAGFLAG) 
 
 .IF "$(OS)"=="MACOSX"
-DIR_FILE_LIST += $(DESTDIRBIN)$/addsym-macosx.sh
+DIR_FILE_LIST += $(DESTDIRBIN)/addsym-macosx.sh
 .ENDIF
     
 .IF "$(SOLAR_JAVA)" != ""
-DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll
+DIR_FILE_LIST += $(DESTDIRJAR)/win/unowinreg.dll
 .ENDIF
 
 DIR_DIRECTORY_LIST:=$(uniq $(DIR_FILE_LIST:d))
-DIR_CREATE_FLAG:=$(MISC)$/copying_dirs_created.txt
-DIR_FILE_FLAG:=$(MISC)$/copying_files.txt
+DIR_CREATE_FLAG:=$(MISC)/copying_dirs_created.txt
+DIR_FILE_FLAG:=$(MISC)/copying_files.txt
 
 .IF "$(SOLAR_JAVA)" != ""
 # Special work for simple uno bootstrap mechanism
 # zip uno loader class files and winreg helper library for later
 # use in the build process (e.g. helper tools)
-MYZIPTARGET=$(BIN)$/uno_loader_classes.zip
+MYZIPTARGET=$(BIN)/uno_loader_classes.zip
 MYZIPFLAGS=-u -r
 MYZIPDIR=$(DESTDIRJAR)
-MYZIPLIST=com$/* win$/*
+MYZIPLIST=com/* win/*
 
 .ENDIF
 
@@ -221,21 +221,21 @@ all : CLEAN_DKVERSION_CHECK \
 #--------------------------------------------------
 # use global rules
 #--------------------------------------------------
-.INCLUDE: $(PRJ)$/util$/odk_rules.pmk
+.INCLUDE: $(PRJ)/util/odk_rules.pmk
 
 
-CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)$/dk.mk
+CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)/dk.mk
 
     
 CLEAN_DKVERSION_CHECK:
     @@-rm -f $(CLEANUP_DKVERSION_FILE)
 
-$(DESTDIRBIN)$/addsym-macosx.sh : addsym-macosx.sh
+$(DESTDIRBIN)/addsym-macosx.sh : addsym-macosx.sh
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
     -chmod 755 $@
 
-$(DESTDIRSETTINGS)$/dk.mk : dk.mk
+$(DESTDIRSETTINGS)/dk.mk : dk.mk
     @@-rm -f $@
     -$(MKDIRHIER) $(@:d)
     tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
@@ -244,7 +244,7 @@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
     $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
     @echo "tags converted" > $@
 
-$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)$/docs$/common$/ref$/idl.css
+$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
     @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF)
     $(TOUCH) $@
 
@@ -252,11 +252,11 @@ $(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
     -$(MKDIRHIER) $(@:d) 
     $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" \
         -name $(IDLDOCREFNAME) -lg idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL)
-    -rm $(@:d)$/idl.css
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/common$/ref$/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/idl.css
+    -rm $(@:d)/idl.css
+    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)/docs/common/ref/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)/idl.css
 
  
 .IF "$(SOLAR_JAVA)" != ""
-$(MYZIPTARGET) : $(BIN)$/unowinreg.dll $(DESTCLASSESLIST)
-    cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ..$/..$/..$/bin$/$(MYZIPTARGET:b) $(MYZIPLIST)
+$(MYZIPTARGET) : $(BIN)/unowinreg.dll $(DESTCLASSESLIST)
+    cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b) $(MYZIPLIST)
 .ENDIF