Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / wxPython / distrib / makedocs

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index 4fb5faf345bfeee8a5d6873f6579d33b999f60f4..682b6b7a8e3521ab42903419536de3ddf786307a 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -12,18 +12,20 @@ VERSION=`python -c "import setup;print setup.VERSION"`
 CONTRIBS="ogl gizmos"
 DEST=wxPython-$VERSION/docs
 
+
 # **** Make a directory to build up a distribution tree
 mkdir -p _build_docs/$DEST
 cd _build_docs
 mkdir $DEST/wx
 
 WXDIR=../..
+INI=$WXDIR/docs/latex/wx/tex2rtf.ini
 
 # **** Build the main docs using tex2rtf
 echo "****" main "****"
 cp $WXDIR/docs/latex/wx/*.gif $DEST/wx
 cp $WXDIR/docs/latex/wx/*.css $DEST/wx
-$WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
+tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $INI
 cp $DEST/wx/wx_contents.html $DEST/wx/index.html
 cp $DEST/wx/* $WXDIR/docs/html/wx
 
@@ -33,7 +35,7 @@ for c in $CONTRIBS; do
     mkdir $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.gif $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.bmp $DEST/$c
-    $WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
+    tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $INI
     cp $DEST/$c/$c.html $DEST/$c/index.html || cp $DEST/$c/${c}_contents.html $DEST/$c/index.html
 done