3 files changed, 27 insertions, 22 deletions
diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX
index 5f06ea0314f..b4e34a4ab32 100644
--- a/cpp/INSTALL.LINUX
+++ b/cpp/INSTALL.LINUX
@@ -6,7 +6,7 @@ Requirements
 Operating System
 ----------------
 
-A recent Linux distribution for x86 (i386) or x86_64.
+A recent Linux distribution for x86 or x86_64.
 
 
 C++ compiler
@@ -123,12 +123,16 @@ To build Ice in 64 bit mode, you need to do the following:
   libraries in the "lib64" directories. For example, put Berkeley DB
   64 bit libraries in $DB_HOME/lib64.
 
-- Set the environment variable LP64 to yes, as shown below:
-
-  $ export LP64=yes
-
 - Build and test as described above (with gcc).
 
+======================================================================
+32 bit builds on x86_64
+======================================================================
+
+By default, builds on x86_64 are 64-bit. To perform a 32-bit build
+on a x86_64 Linux system, set the environment variable LP64 to no,
+as shown below:
+  $ export LP64=no
 
 ======================================================================
 Installation
@@ -145,5 +149,5 @@ programs, you must pass the location of the <prefix>/include directory
 to the compiler with the -I option, and the location of the
 <prefix>/lib directory with the -L option.  
 
-If LP64 is set to yes, the libraries are installed in <prefix>/lib64.
-No other changes are necessary.
+On a x86_64 system, the libraries are installed in <prefix>/lib64
+unless LP64 is set to no. No other changes are necessary.
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index bd665c9f5eb..87a13a3df72 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -22,8 +22,8 @@ prefix			?= /opt/Ice-$(VERSION)
 #OPTIMIZE		= yes
 
 #
-# Define LP64 as yes if you want to build in 64 bit mode on a platform
-# that supports both 32 and 64 bit.
+# Define LP64 as yes or no if you want force a 32 or 64 bit. The default
+# is platform-dependent
 #
 #LP64			:= yes
 
@@ -102,18 +102,19 @@ endif
 #OPENSSL_HOME		?= /opt/openssl
 
 #
-# Define if your OpenSSL requires Kerberos, and if Kerberos is not
-# installed in a standard location.
-#
-
-KERBEROS_HOME		?= /usr/kerberos
-
-#
 # If expat is not installed in a standard location where the
 # compiler can find it, set EXPAT_HOME to the expat
 # installation directory.
 #
 
+#
+# Define if your OpenSSL requires Kerberos, and if Kerberos is not
+# installed in a standard location
+#
+
+KERBEROS_HOME           ?= /usr/kerberos
+
+
 #EXPAT_HOME		?= /opt/expat
 
 
@@ -188,14 +189,10 @@ else
     STLPORT_LIBS	=
 endif
 
-OPENSSL_FLAGS           = $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include)
+OPENSSL_FLAGS           = $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) -I$(KERBEROS_HOME)/include
 OPENSSL_LIBS            = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto
 OPENSSL_RPATH_LINK      = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir)))
 
-ifneq ($(KERBEROS_HOME),)
-    OPENSSL_FLAGS	+= -I$(KERBEROS_HOME)/include
-endif
-
 BZIP2_FLAGS             = $(if $(BZIP2_HOME),-I$(BZIP2_HOME)/include)
 BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
 
@@ -218,7 +215,7 @@ endif
 
 ifeq ($(PLATFORM_HAS_READLINE),yes)
     ifeq ($(USE_READLINE),yes)
-        READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$READLINE_HOME)/include)
+        READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
         READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses        
     endif
 endif
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 961338e7bac..df262438738 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -31,6 +31,10 @@ endif
 CFLAGS = -O2
 
 ifeq ($(MACHINE),x86_64)
+   
+   ifeq ($(LP64),)
+      LP64      = yes
+   endif
    ifeq ($(LP64),yes)
       CFLAGS	+= -m64
    else