From f9c82c9bbbf6f8cc04b6dc127e1533d39799eeaf Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 20 Mar 2003 22:13:10 +0000
Subject: [PATCH] Duplicated the handling of 64 bit linux builds for ia64 and
 x86_64 and placed them under the seperate paths for Intel vs GNU compilers.

---
 Make/makedefs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Make/makedefs b/Make/makedefs
index 4442c7c5d..4ca015c3d 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -252,23 +252,32 @@ ifeq ($(OS),Linux)
     DEF             += -KPIC
     OPTF            = -O2 
     DBGF            = -g -DOSG_COMPILE_UNIT_TESTS 
+    ifeq ($(SYSARCH),ia64)
+      ARCHARGS        = 
+      ARCH            = 64
+      ARCHINST        = 64
+    else
+      ARCHARGS        = 
+      ARCH            = 32
+      ARCHINST        = 
+    endif
   else
     LIBS            = -lstdc++
     DEF             += -W -Wall -fPIC
     OPTF            = -O2 
     DBGF            = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS 
+    SYSARCH           := $(shell arch)
+    ifeq ($(SYSARCH),x86_64)
+      ARCHARGS        = -m64 -DARCH64
+      ARCH            = 64
+      ARCHINST        = 64
+    else
+      ARCHARGS        = 
+      ARCH            = 32
+      ARCHINST        = 
+    endif
   endif
 
-  SYSARCH           := $(shell arch)
-  ifeq ($(SYSARCH),ia64)
-    ARCHARGS        = -m64 -DARCH64
-    ARCH            = 64
-    ARCHINST        = 64
-  else
-    ARCHARGS        = 
-    ARCH            = 32
-    ARCHINST        = 
-  endif
 
   SHARED            = -shared
   LINKARGS          = -L/usr/X11R6/lib