From 0c1546a0a45893bc69f5bc1953337c116ae55453 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 3 Jul 2006 22:42:25 +0000 Subject: [PATCH] added 64bit lib lookup git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1295 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ldap/NGLdap/GNUmakefile.preamble | 5 ++++- sope-ldap/NGLdap/fhs.make | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index e374b012..6fa86651 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -70,8 +70,11 @@ 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 +else SYSTEM_LIB_DIR += -L/usr/local/lib - +endif # Apple diff --git a/sope-ldap/NGLdap/fhs.make b/sope-ldap/NGLdap/fhs.make index 27422bdc..3bacf6da 100644 --- a/sope-ldap/NGLdap/fhs.make +++ b/sope-ldap/NGLdap/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-header-dirs :: $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGLdap_HEADER_FILES_INSTALL_DIR) -- 2.39.5