X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/312cca179a996f6d056bb71dab241356f4207d1c..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/docs/INSTALL.txt

diff --git a/wxPython/docs/INSTALL.txt b/wxPython/docs/INSTALL.txt
index 860a6cea3e..848359181f 100644
--- a/wxPython/docs/INSTALL.txt
+++ b/wxPython/docs/INSTALL.txt
@@ -1,12 +1,14 @@
-Installing wxPython 2.5 from Source
+Installing wxPython 2.6 from Source
 ===================================
 
 
 This document will describe the few differences and additions to the
-content in BUILD.txt for installing wxPython built from source.
-Please follow the intstructions both in this file and in BUILD.txt to
-perform this task.  Where there is overlap the items described here
-will take precedence.
+content in the BUILD_ document for installing wxPython built from
+source.  Please follow the intstructions both in this file and in
+BUILD_ to perform this task.  Where there is overlap the items
+described here will take precedence for doing installations.
+
+.. _BUILD: BUILD.html
 
 
 
@@ -35,7 +37,7 @@ Installing on Unix-like Systems (not OS X)
    It does add extra code to the build but probably not enough to
    worry about it.  However if you want to get as lean a build as
    possible you can leave it out, but if your code does something bad
-   then instead of exceptions you'll likely get a crash.
+   then instead of exceptions you'll likely get a crash::
 
 		      --enable-debug_flag \
 
@@ -46,7 +48,7 @@ Installing on Unix-like Systems (not OS X)
    path into the binaries by using the rpath option when configuring
    wxWidgets.  For example::
 
-                     --enable-rpath=/opt/wx/2.5/lib \
+                     --enable-rpath=/opt/wx/2.6/lib \
 
    SOLARIS NOTE: The --enable-rpath option may cause problems when
    using wxGTK on Solaris when compiling wxPython as described below.
@@ -64,9 +66,11 @@ Installing on Unix-like Systems (not OS X)
 
 4. In addition to building wxPython as described in BUILD.txt, you can
    install it to Python's site-packages dir, as well as some scripts
-   into the same bin dir used by Python by using this command::
+   into the same bin dir used by Python by using this command, plus
+   whatever WXPORT, UNICODE, etc. settings you used for the initial
+   build step::
 
-	python2.3 setup.py install
+	python2.3 setup.py install 
 
    If you would like to install to some place besides the prefix where
    Python is installed, (such as to your home directory) then you can
@@ -99,8 +103,8 @@ instructions above, except for a few small, but important details:
    Python Framework will then be installed in /Library/Frameworks.  On
    10.3 (Panther) Apple supplies the Python Framework as part of the
    OS install, but it will be located in /System/Library/Frameworks
-   instead.  However, on Panther the site-pacakges dir is sym-linked
-   to /Library/Python/2.3 so the wxPython pacakges will end up there,
+   instead.  However, on Panther the site-packages dir is sym-linked
+   to /Library/Python/2.3 so the wxPython packages will end up there,
    although they will still be visible from site-packages.  If you are
    building distributions of wxPython to be installed on other
    machines be careful to install to /Library/Python/2.3.  To
@@ -108,9 +112,9 @@ instructions above, except for a few small, but important details:
    you do yourself will end up in /Library/Frameworks even on
    Panther...
 
-3. You need to use pythonw at the command line or PythonLauncher app
-   to run wxPython apps, otherwise the app will not be able to fully
-   use the GUI display.
+3. You need to use pythonw at the command line or the PythonLauncher
+   app to run wxPython apps, otherwise the app will not be able to
+   fully use the GUI display.
 
 
 
@@ -125,7 +129,8 @@ Installing on Windows
    "hybrid" when building wxWidgets and add "FINAL=1" to the setup.py
    command line.
 
-2. Install wxPython like this::
+2. Install wxPython like this.  Remember to add any additional flags
+   you added for the build such as UNICODE or USE_SWIG::
 
       python setup.py install
 
@@ -134,6 +139,6 @@ Installing on Windows
    found at runtime by the extension modules without requiring that
    they be installed on the PATH::
 
-	copy %WXWIN%\lib\vc_dll\wx*h_*.dll c:\Python23\Lib\site-pacakges\wx
+	copy %WXWIN%\lib\vc_dll\wx*h_*.dll c:\Python23\Lib\site-packages\wx