X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1281c5c1885dc77a4e98b6e443da592694561b6a..4d4f4290eaf2b60554ca3a0c53ffa8805012e155:/docs/os2/install.txt

diff --git a/docs/os2/install.txt b/docs/os2/install.txt
index dbd769539d..dd8ce11ad4 100644
--- a/docs/os2/install.txt
+++ b/docs/os2/install.txt
@@ -1,7 +1,7 @@
-Installing wxWindows 2.3.3
+Installing wxWindows 2.5.1
 --------------------------
 
-This is wxWindows 2.3.3 for IBM OS/2 Warp3 and Warp4. This is an unstable
+This is wxWindows 2.5.1 for IBM OS/2 Warp3 and Warp4. This is an unstable
 development release and OS/2 is considered to be in beta.
 
 IMPORTANT NOTE: If you experience problems installing, please
@@ -17,7 +17,7 @@ Unarchiving
 At this time there is no comprehensive setup.exe type installation program.
 wxWindows for OS/2 requires you download various .zip files and unpack them
 to your desired location on your system.  Pick a location say,
-C:\wx\wxWindows-2.2.3, copy the .zip files to there and unzip them ensuring you
+C:\wx\wxWindows-2.5.1, copy the .zip files to there and unzip them ensuring you
 unzip the subdirectories as well.  You will need:
 
 - All common, generic and OS2-specific wxWindows source;
@@ -30,7 +30,7 @@ unzip the subdirectories as well.  You will need:
 - PNG library source;
 - ZLIB library source;
 
-All but the documentation is included in wxOS2-2.3.3.zip, documentation
+All but the documentation is included in wxOS2-2.5.1.zip, documentation
 must be downloaded separately from the wxWindows Web site.
 
 Other add-on packages are available from the wxWindows Web site, such as:
@@ -46,27 +46,27 @@ General installation notes
 After unzipping everything your directory tree should look something like
 this:
 
-x:\wx\wxWindows-2.2.3\docs (your HTML reference manual)
-x:\wx\wxWindows-2.2.3\include\wx
-x:\wx\wxWindows-2.2.3\include\wx\generic
-x:\wx\wxWindows-2.2.3\include\wx\html
-x:\wx\wxWindows-2.2.3\include\wx\os2
-x:\wx\wxWindows-2.2.3\samples\....  (all the sample directories)
-x:\wx\wxWindows-2.2.3\src
-x:\wx\wxWindows-2.2.3\src\common
-x:\wx\wxWindows-2.2.3\src\generic
-x:\wx\wxWindows-2.2.3\src\html
-x:\wx\wxWindows-2.2.3\src\jpeg
-x:\wx\wxWindows-2.2.3\src\os2
-x:\wx\wxWindows-2.2.3\src\png
-x:\wx\wxWindows-2.2.3\src\tiff
-x:\wx\wxWindows-2.2.3\src\zlib
+x:\wx\wxWindows-2.5.1\docs (your HTML reference manual)
+x:\wx\wxWindows-2.5.1\include\wx
+x:\wx\wxWindows-2.5.1\include\wx\generic
+x:\wx\wxWindows-2.5.1\include\wx\html
+x:\wx\wxWindows-2.5.1\include\wx\os2
+x:\wx\wxWindows-2.5.1\samples\....  (all the sample directories)
+x:\wx\wxWindows-2.5.1\src
+x:\wx\wxWindows-2.5.1\src\common
+x:\wx\wxWindows-2.5.1\src\generic
+x:\wx\wxWindows-2.5.1\src\html
+x:\wx\wxWindows-2.5.1\src\jpeg
+x:\wx\wxWindows-2.5.1\src\os2
+x:\wx\wxWindows-2.5.1\src\png
+x:\wx\wxWindows-2.5.1\src\tiff
+x:\wx\wxWindows-2.5.1\src\zlib
 
 If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWindows-2.2.3\lib
+\lib directory as well, x:\wx\wxWindows-2.5.1\lib
 and you will have to set a WXWIN environment variable in your
 config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.2.3;
+SET WXWIN=X:\WX\WXWINDOWS-2.5.1;
 
 Compilation
 -----------
@@ -163,7 +163,10 @@ Compilation using EMX
 In addition to EMX-0.9d you will need a rather complete Unix-like
 environment, starting with a shell (e.g. ash) and most of the
 GNU file/text/shell utilities, but also flex, bison, sed, grep, awk
-and GNU make.
+and GNU make. Particularly note that uname is relevant to get the
+configure script working - the one from GNU shell utilities 1.12
+does work (check that uname -s returns "OS/2" and uname -m returns "i386"
+and you should be mostly fine.
 
 The first thing to do is to decide on a build directory. You can either
 do in-tree builds or you can do the build in a directory separated from
@@ -173,13 +176,18 @@ developping cross-platform applications you might want to compile (and
 update) e.g. wxGTK or wxX11 as well.
 
 In the following, let's assume you decided to build in
-\wx\wxWindows-2.2.3\build\pm. Now we need to set some environment
-variables, namely MAKE_SHELL (to a Unix like shell, let's assume ash)
+\wx\wxWindows-2.5.1\build\pm. Now we need to set some environment
+variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
 and INSTALL (to point to the install script. If you omit this, configure
 might find something like the system's tcpip\pcomos\install.exe which will
 not do the thing you want), e.g.
-SET MAKE_SHELL=ash
-SET INSTALL=/wx/wxWindows-2.2.3/install-sh.
+SET MAKESHELL=ash
+SET INSTALL=/wx/wxWindows-2.5.1/install-sh -c
+
+Be warned that depending on the precise version of your make, the
+variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
+If you have a really deficient version of GNU make, it might even be
+necessary to set SHELL or even COMSPEC to a unix like shell as well.
 
 Now run the provided configure script by executing e.g.
 `ash -c "../../configure \
@@ -217,7 +225,7 @@ Finally, if you also want to build a different port, e.g. wxGTK, you
 essentially have to use the procedure described above, the only difference
 being that you have to pass a switch to configure indicating which port
 to build. If you do not do this in a separate build directory (e.g.
-\wxWindows-2.2.3\build\gtk), you'll have to do a `make clean' first.
+\wxWindows-2.5.1\build\gtk), you'll have to do a `make clean' first.
 The magical switches that have to be passed to configure for the various
 ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
 and --disable-gui (wxBase). Note that contrary to the native, PM based