docu fixes

2 files changed, 45 insertions, 8 deletions

diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index 436d77890d1..bf92c32977c 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -29,7 +29,7 @@ Third-party libraries
 
 - Xerces-C++ 2.1.0
 
-- Berkeley DB 3.3 or 4.0
+- Berkeley DB 3.3, 4.0, or 4.1
 
 - OpenSSL 0.9.6
 
@@ -75,10 +75,11 @@ running the test scripts, Python is not required.
 
 
 ======================================================================
-Installation
+Compilation and Testing
 ======================================================================
 
-Extract the Ice archive, for example, in your home directory:
+Extract the Ice archive in any directory you like (for example, in
+your home directory):
 
 $ tar xvfz Ice-<version>.tar.gz
 
@@ -112,3 +113,16 @@ $ python2 allTests.py
 
 If everything worked out, you should see lots of "ok". In case of a
 failure, the tests abort with "failed".
+
+If you want to try out any of the demos, make sure to add "bin" to
+PATH and "lib" to LD_LIBRARY_PATH:
+
+$ export PATH=`pwd`/bin:$PATH
+$ export LD_LIBRARY_PATH=`pwd`/bin:$LD_LIBRARY_PATH
+
+
+======================================================================
+Installation
+======================================================================
+
+TBD
\ No newline at end of file
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 38c780a124c..577e48c458a 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -13,27 +13,50 @@
 # **********************************************************************
 
 #
-# The locations of STLport, Berkeley DB, and other libraries used by
-# this package.
-#
 # The values below can be overwritten by defining them as environment
 # variables. For example, if you are using a bourne shell or
 # compatible, you can overwrite the location of STLport like this:
 #
 # export STLPORT_HOME=/usr/local/STLport-4.5
 #
-# If you don't want to use STLport, but the compiler's default STL
-# implementation, then define STLPORT_HOME as empty string.
+
+#
+# If you want to use STLport, set STLPORT_HOME to the STLport
+# installation directory. If STLPORT_HOME is undefined or empty,
+# STLport is not used.
 #
+
 #STLPORT_HOME		?= /opt/STLport
+
+#
+# If Berkeley DB is not installed in a standard location where the
+# compiler can find it, set DB_HOME to the Berkeley DB installation
+# directory.
+#
+
 #DB_HOME		?= /opt/db
+
+#
+# If OpenSSL is not installed in a standard location where the
+# compiler can find it, set OPENSSL_HOME to the OpenSSL installation
+# directory.
+#
+
 #OPENSSL_HOME		?= /opt/openssl
+
+#
+# If Xerces-C++ is not installed in a standard location where the
+# compiler can find it, set XERCESC_HOME to the Xerces-C++
+# installation directory.
+#
+
 #XERCESC_HOME		?= /opt/xerces-c
 
 #
 # Define OPTIMIZE as yes if you want to build with
 # optimization. Otherwise Ice is build with debug information.
 #
+
 #OPTIMIZE		= yes
 
 # ----------------------------------------------------------------------