mingw32/cygwin compilation fixes

[wxWidgets.git] / docs / latex / book / makefile.vc

diff --git a/docs/latex/book/makefile.vc b/docs/latex/book/makefile.vc
index ba3256f59cf0ef888325f61cf4b5d7c6a7b4cc00..74ae66d6c8a53e325e26d0f514bf598a5e6b57ad 100644 (file)
--- a/docs/latex/book/makefile.vc
+++ b/docs/latex/book/makefile.vc
@@ -10,10 +10,12 @@
 
 THISDIR=$(WXWIN)\src\msw
 # WXDIR=$(WXWIN)
-WXDIR=d:\wx2\wxWindows
+WXDIR=$(WXWIN)
 
 DOCDIR = $(WXDIR)\docs
 
+WAITFLAG=/wait
+
 # Making documents
 docs:   bookhlp bookhtml bookpdfrtf htb htmlhelp
 alldocs: docs
@@ -61,8 +63,9 @@ $(DOCDIR)\html\book\book.htm:         $(DOCDIR)\latex\book\book.tex
 $(DOCDIR)\htmlhelp\book.chm : $(DOCDIR)\html\book\book.htm $(DOCDIR)\html\book\book.hhp
        cd $(DOCDIR)\html\book
        -hhc book.hhp
-    -mkdir ..\..\htmlhelp
-    move book.chm ..\..\htmlhelp
+        -mkdir ..\..\htmlhelp
+        -erase ..\..\htmlhelp\book.chm
+        move book.chm ..\..\htmlhelp
        cd $(THISDIR)
 
 $(WXDIR)\docs\latex\book\book.dvi:     $(DOCDIR)/latex/book/body.tex $(DOCDIR)/latex/book/book.tex
@@ -87,8 +90,8 @@ $(WXDIR)\docs\ps\book.ps:     $(WXDIR)\docs\latex\book\book.dvi
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\book.htb: $(DOCDIR)\html\book\book.htm
        cd $(WXDIR)\docs\html\book
-    -erase /Y book.zip book.htb
-    zip32 book.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -erase book.zip book.htb
+    zip book.zip *.htm *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move book.zip $(DOCDIR)\htb\book.htb
     cd $(THISDIR)
@@ -100,11 +103,11 @@ touchbook:
 updatedocs: touchbook alldocs
 
 cleandocs:
-    -erase /Y $(DOCDIR)\html\book\book.htm
-    -erase /Y $(DOCDIR)\pdf\book.rtf
-    -erase /Y $(DOCDIR)\latex\book\book.rtf
-    -erase /Y $(DOCDIR)\htmlhelp\book.chm
-    -erase /Y $(DOCDIR)\htb\book.htb
+    -erase $(DOCDIR)\html\book\*.htm
+    -erase $(DOCDIR)\pdf\book.rtf
+    -erase $(DOCDIR)\latex\book\book.rtf
+    -erase $(DOCDIR)\htmlhelp\book.chm
+    -erase $(DOCDIR)\htb\book.htb
 
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.