From aac57390ab70ac6d2f561ed018a23c9fe1069c44 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 4 Jul 2006 00:06:04 +0000 Subject: [PATCH] fixed makefiles for 64bit git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1299 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WOXML/GNUmakefile.preamble | 4 ++++ sope-ldap/samples/GNUmakefile.preamble | 4 ++++ sope-ldap/samples/fhs.make | 7 ++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sope-appserver/WOXML/GNUmakefile.preamble b/sope-appserver/WOXML/GNUmakefile.preamble index 30f4ddfb..a22b657e 100644 --- a/sope-appserver/WOXML/GNUmakefile.preamble +++ b/sope-appserver/WOXML/GNUmakefile.preamble @@ -29,7 +29,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 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif # Apple diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble index 6670de76..34163b02 100644 --- a/sope-ldap/samples/GNUmakefile.preamble +++ b/sope-ldap/samples/GNUmakefile.preamble @@ -48,7 +48,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 # OS dependend stuff diff --git a/sope-ldap/samples/fhs.make b/sope-ldap/samples/fhs.make index 27c85d13..9c684b4d 100644 --- a/sope-ldap/samples/fhs.make +++ b/sope-ldap/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