From 6ac400b30ed821c219dff9f7db63f2ff8222d254 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 16 Mar 2006 09:06:20 +0000
Subject: [PATCH] defs.mk: Make it compile under SuSE 10.0, X86-64

---
 make/defs.mk | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 0094456f..e1a895d3 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -180,7 +180,7 @@ ifeq ($(QT_VERSION),2)
 QT_PREFIX              = /usr/lib/qt2
 else
 	ifeq ($(QT_VERSION),3)
-	QT_PREFIX      = /usr/lib/qt3
+		QT_PREFIX      = /usr/lib/qt3
 	else
 		ifeq ($(QT_VERSION),4)
 		QT_PREFIX = $(HOME)/opt/qt4
@@ -191,7 +191,13 @@ endif
 
 INCLUDE               += -I$(QT_PREFIX)/include
 
-LD_LIB_PATH           += $(QT_PREFIX)/lib
+ifeq ($(ARCH),x86)
+	LD_LIB_PATH   += $(QT_PREFIX)/lib
+	QT_LDFLAGS    += -L$(QT_PREFIX)/lib
+else
+	LD_LIB_PATH   += $(QT_PREFIX)/lib64
+	QT_LDFLAGS    += -L$(QT_PREFIX)/lib64
+endif
 
 MOC                    = $(QT_PREFIX)/bin/moc
 UIC                    = $(QT_PREFIX)/bin/uic
@@ -217,21 +223,25 @@ OBJ                   += $(patsubst %.cpp,%.o,$(RCC_CPP))
 
 ifdef REENTRANT
 	ifneq ($(QT_VERSION),4)
-	LPPFLAGS      += -L$(QT_PREFIX)/lib -lqt-mt
+	LPPFLAGS      += $(QT_LDFLAGS) -lqt-mt
 	else
-	LPPFLAGS      += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
 	endif
 else
 	ifneq ($(QT_VERSION),4)
-	LPPFLAGS      += -L$(QT_PREFIX)/lib -lqt
+	LPPFLAGS      += $(QT_LDFLAGS) -lqt
 	else
-	LPPFLAGS      += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
 	endif
 endif
 
 endif
 ifeq ($(USE_X),true)
-LDFLAGS               += -L/usr/X11/lib -lXext -lX11
+  ifeq ($(ARCH),x86)
+    LDFLAGS               += -L/usr/X11/lib -lXext -lX11
+  else
+    LDFLAGS               += -L/usr/X11/lib64 -lXext -lX11
+  endif
 endif
 
 LPPFLAGS              += -lstdc++