diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 9daf49af7b..3e1fda9a55 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -5,10 +5,13 @@ rem  it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
 rem  writes a log file in c:\
 
+echo Building wxWidgets docs... > c:\temp.log
+
 set WXWIN=c:\wx\wxWidgets
+set DAILY=c:\daily
 set PATH=%PATH%;C:\wx\wxWidg~1.3\utils\tex2rtf\src\vc_based;C:\wx\GnuWin32\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
 set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
-echo %PATH% >>  c:\temp.log
+echo %PATH% >> c:\temp.log
 
 rem update wxwidgets (holds docs) and inno (cvs wxMSW module only)
 c:
@@ -16,7 +19,7 @@ cd %WXWIN%
 cvs up -P -d
 cd \wx\inno\wxWidgets
 cvs up -P
-echo CVS update  >  c:\temp.log
+echo CVS update  >>  c:\temp.log
 
 
 rem add nmake to the path and build the docs
@@ -27,7 +30,7 @@ cd %WXWIN%\build\script
 nmake -f makedocs.vc cleandocs
 nmake -f makedocs.vc alldocs
 
-del c:\daily\in\*.p*
+del %DAILY%\in\*.p*
 echo starting word >>  c:\temp.log
 start /WAIT winword /mwx_ps
 
@@ -38,7 +41,7 @@ rem use ghostscript ps2pdf - add extra path first
 rem set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
 rem set PATH=%PATH%;C:\wx\GnuWin32\bin;C:\PROGRA~1\INNOSE~1
 
-cd \daily\in
+cd %DAILY%\in
 call ps2pdf wx.ps >>  c:\temp.log
 call ps2pdf fl.ps >> c:\temp.log
 call ps2pdf gizmos.ps >> c:\temp.log
@@ -53,22 +56,22 @@ iscc wxwidgets.iss >> c:\temp.log
 
 echo Zipping
 cd %WXWIN%
-del \daily\*.zip
-zip \daily\wx-docs-chm.ZIP docs\htmlhelp\wx.chm
-zip \daily\wx-docs-pdf.ZIP C:\daily\in\wx.pdf
-zip \daily\wx-docs-hlp.ZIP docs\winhelp\wx.hlp docs\winhelp\wx.cnt
-zip \daily\wx-docs-extra-hlp.ZIP utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt -x  docs/winhelp/wx.hlp docs/winhelp/wx.*
-zip \daily\wx-docs-extra-chm.ZIP utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm 
-cd \daily\in
-zip \daily\wx-docs-extra-pdf.ZIP *.pdf -x wx.pdf
+del %DAILY%\*.zip
+zip %DAILY%\wx-docs-chm.ZIP docs\htmlhelp\wx.chm
+zip %DAILY%\wx-docs-pdf.ZIP %DAILY%\in\wx.pdf
+zip %DAILY%\wx-docs-hlp.ZIP docs\winhelp\wx.hlp docs\winhelp\wx.cnt
+zip %DAILY%\wx-docs-extra-hlp.ZIP utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt -x  docs/winhelp/wx.hlp docs/winhelp/wx.*
+zip %DAILY%\wx-docs-extra-chm.ZIP utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm 
+cd %DAILY%\in
+zip %DAILY%\wx-docs-extra-pdf.ZIP *.pdf -x wx.pdf
 
 
 echo setting S
 rem echo yes > net use s: /delete
 net use s: \\biolpc22\bake 
 
-copy \daily\*.ZIP s:\bkl-cronjob\archives\win
-copy \daily\*.exe s:\bkl-cronjob\archives\win\*.EXE
+copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win
+copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.EXE
 
 
 
diff --git a/build/script/word_macro.txt b/build/script/word_macro.txt
index a53d4f2d26..ac37329e55 100644
--- a/build/script/word_macro.txt
+++ b/build/script/word_macro.txt
@@ -1,17 +1,16 @@
 ' This is saved as word macros; opens a pdf and writes out a ps file using
 ' laserjet ps driver
-' Note that the input and output directories are hard coded and the output dir must exist
-
+' Note that the output dir and hardcoded printer must exist
 
 Sub wx_ps()
-
-    do_ps "C:\wx\wxWidgets\docs\pdf\", "wx"
-    do_ps "C:\wx\wxWidgets\contrib\docs\latex\svg", "svg"
-    do_ps "C:\wx\wxWidgets\contrib\docs\latex\ogl", "ogl"
-    do_ps "C:\wx\wxWidgets\contrib\docs\latex\mmedia", "mmedia"
-    do_ps "C:\wx\wxWidgets\contrib\docs\latex\gizmos", "gizmos"
-    do_ps "C:\wx\wxWidgets\contrib\docs\latex\fl", "fl"
-    do_ps "C:\wx\wxWidgets\utils\tex2rtf\docs", "tex2rtf"
+    swxWIN = Environ("WXWIN")
+    do_ps swxWIN & "\docs\pdf\", "wx"
+    do_ps swxWIN & "\contrib\docs\latex\svg", "svg"
+    do_ps swxWIN & "\contrib\docs\latex\ogl", "ogl"
+    do_ps swxWIN & "\contrib\docs\latex\mmedia", "mmedia"
+    do_ps swxWIN & "\contrib\docs\latex\gizmos", "gizmos"
+    do_ps swxWIN & "\contrib\docs\latex\fl", "fl"
+    do_ps swxWIN & "\utils\tex2rtf\docs", "tex2rtf"
 
     bye_bye
 End Sub
@@ -20,6 +19,7 @@ Sub do_ps(mydir, myfile)
 ' wx_ps Macro
 ' Macro recorded 04/05/2005 by cje2
 '
+    sDAILYIN = Environ("DAILY") & "\in\"
     ChangeFileOpenDirectory mydir
     Documents.Open FileName:=myfile & ".rtf", ConfirmConversions:=False, ReadOnly:= _
         False, AddToRecentFiles:=False, PasswordDocument:="", PasswordTemplate:= _
@@ -30,7 +30,12 @@ Sub do_ps(mydir, myfile)
         wdPrintDocumentContent, Copies:=1, Pages:="", PageType:=wdPrintAllPages, _
         Collate:=True, Background:=False, PrintToFile:=True, PrintZoomColumn:=0, _
         PrintZoomRow:=0, PrintZoomPaperWidth:=0, PrintZoomPaperHeight:=0, _
-        OutputFileName:="C:\daily\in\" & myfile & ".ps", Append:=False
+        OutputFileName:=sDAILYIN & myfile & ".ps", Append:=False
     ActiveDocument.Close SaveChanges:=wdDoNotSaveChanges
+   End Sub
 
+Sub bye_bye()
+
+Application.Quit SaveChanges:=wdDoNotSaveChanges
+    
 End Sub