From 16abe51aacbed7bd686f36253e4b24741c67e457 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 3 Jul 2006 19:55:48 +0000
Subject: [PATCH] more 64bit FHS makefile fixes

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1285 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-xml/samples/GNUmakefile.preamble | 4 ++++
 sope-xml/samples/fhs.make             | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sope-xml/samples/GNUmakefile.preamble b/sope-xml/samples/GNUmakefile.preamble
index e6de2b46..d181805c 100644
--- a/sope-xml/samples/GNUmakefile.preamble
+++ b/sope-xml/samples/GNUmakefile.preamble
@@ -42,4 +42,8 @@ ADDITIONAL_LIB_DIRS += \
 	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
diff --git a/sope-xml/samples/fhs.make b/sope-xml/samples/fhs.make
index 27c85d13..9c684b4d 100644
--- a/sope-xml/samples/fhs.make
+++ b/sope-xml/samples/fhs.make
@@ -5,9 +5,14 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
 
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
+
 fhs-bin-dirs ::
 	$(MKDIRS) $(FHS_BIN_DIR)
 
-- 
2.39.5