The correct naming convention for RHEL is

RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch.  However, it should only do this if
uname -m is not x86_64.  Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention.  The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ.  I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.  These changes are
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.

For ldapserver, I had to change nsarch (adminserver changed nsarch in a
different way).  I also got rid of the 32 bit specific setup stuff.  I
assume this was due to 32 bit NES admin server, so we can get rid of
this for the future, because we will have all native 64 bit apps. I also
went ahead and rolled in the gcc4 changes since they are safe for gcc3
as well.

1 files changed, 10 insertions, 0 deletions

diff --git a/nsarch b/nsarch
index ae5d6f92..c9e5c935 100755
--- a/nsarch
+++ b/nsarch
@@ -607,6 +607,16 @@ EOF
 	  fi
           ns_printf
           exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_x86_64"; then
+	  #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	  GNU_NAME="${UNAME_MACHINE}-unknown-linux"
+          NS_NAME="${UNAME_SYSTEM}"
+          NS_RELEASE="${UNAME_RELEASE}"
+	  if echo "$NS_RELEASE" | grep >/dev/null 2>&1 "2.0."; then
+		NS_RELEASE="2.0"
+	  fi
+          ns_printf
+          exit 0
 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
 	  #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
 	  GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout"