Fixes

2 files changed, 29 insertions, 19 deletions

diff --git a/cpp/INSTALL.HP-UX b/cpp/INSTALL.HP-UX
index c462638ce7f..745d01fcb92 100644
--- a/cpp/INSTALL.HP-UX
+++ b/cpp/INSTALL.HP-UX
@@ -35,34 +35,46 @@ Third-party libraries
   http://www.sleepycat.com
   
   We recommend to configure Berkeley DB with:
-  CXXFLAGS=-AA ../../dist/configure --enable-cxx --enable-java
-  (and --prefix=<dir> if you like).
+  CXX="aCC -AA" ../dist/configure --enable-cxx
+  (plus --prefix=<dir> and/or --enable-java if you like).
+
+  For 64 bit builds, use:
+  CXX="aCC -AA +DD64" CC="cc +DD64" ../dist/configure --enable-cxx 
+  (plus --prefix=<dir> and/or --enable-java if you like).
  
 - OpenSSL 0.9.7c
   The OpenSSL source distribution can be downloaded from 
   http://www.openssl.org
-  We do _not_ recommend to use the binary distribution available from the
+  We do not recommend to use the binary distribution available from the
   "Sofware Porting And Archive Centre for HP-UX" as it depends on the
   GCC runtime.
   A recommended configuration is:
   ./Configure hpux-parisc2-cc shared
   (and --prefix=<dir> if you like).
 
+  For 64 bit builds, a recommended configuration is:
+  ./Configure hpux64-parisc2-cc shared
+  (and --prefix=<dir> if you like).
+
 - expat 1.9x
   The expat source distribution can be downloaded from: 
   http://sourceforge.net/projects/expat
-  You can also use the binary distribution from the "Sofware Porting And 
-  Archive Centre for HP-UX", http://hpux.cs.utah.edu.
+  For 32 bit builds, you can also use the binary distribution from the 
+  "Software Porting And Archive Centre for HP-UX", 
+  http://hpux.cs.utah.edu.
 
 - bzip2 1.0
-  Source and binary distributions can be downloaded from the "Sofware 
+  The bzip2 source distribution can be downloaded from the "Software 
   Porting And Archive Centre for HP-UX", http://hpux.cs.utah.edu.
+  For 32 bit builds, you can also use the binary distribution from the 
+  "Software Porting And Archive Centre for HP-UX".
+
 
 GNU Make 3.80
 -------------
 
 GNU Make 3.80 is required to build Ice on HP-UX.
-You can download GNU Make from the "Sofware Porting And Archive Centre 
+You can download GNU Make from the "Software Porting And Archive Centre 
 for HP-UX", http://hpux.cs.utah.edu.
 
 
@@ -82,7 +94,7 @@ Compilation and Testing
 Extract the Ice archive in any directory you like (for example, in
 your home directory):
 
-$ tar xvfz Ice-<version>.tar.gz
+$ gunzip -c Ice-<version>.tar.gz | tar xvf -
 
 Change the working directory to Ice-<version>:
 
diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index df6048ee896..8076af085f3 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -35,7 +35,9 @@ installing STLport is not required for this compiler version.
 Third-party libraries
 ---------------------
 
-- Berkeley DB 4.1
+- Berkeley DB 4.1.25 configured with --enable-cxx
+  You can download the Berkeley DB source distribution 
+  from http://www.sleepycat.com
 
 - expat 1.9x
 
@@ -46,21 +48,17 @@ Third-party libraries
 - readline and ncurses (optional, but used unless you set USE_READLINE
   to no in config/Make.rules)
 
-Berkeley DB, expat, OpenSSL, bzip2, readline and ncurses are usually
-available with your Linux distribution.
+expat, OpenSSL, bzip2, readline and ncurses are usually available with 
+your Linux distribution.
 
 The RPMs for RedHat 8.0 are:
-db4-devel-4.0.14-14
 expat-devel-1.95.4-1
 openssl-devel-0.9.6b-29
 bzip2-devel-1.0.2-5
 readline-devel-4.3-3
 ncurses-devel-5.2-28
 
-If you don't have them, you can download Berkeley DB from:
-http://www.sleepycat.com/download
-
-And expat from:
+If you don't have them, you can download expat from:
 http://sourceforge.net/projects/expat/
 
 And OpenSSL from:
@@ -167,18 +165,18 @@ that is supplied by RedHat 9 with Ice, because it was not built
 properly for use with LD_ASSUME_KERNEL. We recommend downloading the
 latest release from the URL shown above.
 
-The steps for building BerkeleyDB are straightforward:
+The steps for building Berkeley DB are straightforward:
 
 $ tar xzf db-X.Y.Z.tar.gz
 $ export LD_ASSUME_KERNEL=2.4.1
 $ cd db-X.Y.Z/build_unix
-$ ../dist/configure --enable-java --prefix=/opt/db-X.Y.Z
+$ ../dist/configure --enable-cxx --enable-java --prefix=/opt/db-X.Y.Z
 $ make
 
 The --enable-java option is necessary if you plan to use Ice for Java.
 The --prefix option overrides the default installation directory.
 
-Please refer to the BerkeleyDB documentation if you need more
+Please refer to the Berkeley DB documentation if you need more
 information.