From c54b3c7fdb18adc5ab048c69d0d5218785c53c4b Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 4 Jul 2006 00:05:26 +0000 Subject: [PATCH] fixed makefiles for 64bit git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1298 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WEPrototype/GNUmakefile.preamble | 4 ++++ sope-appserver/WEPrototype/fhs.make | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sope-appserver/WEPrototype/GNUmakefile.preamble b/sope-appserver/WEPrototype/GNUmakefile.preamble index 72225ddf..cb24a3bd 100644 --- a/sope-appserver/WEPrototype/GNUmakefile.preamble +++ b/sope-appserver/WEPrototype/GNUmakefile.preamble @@ -62,7 +62,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 # bundle dependencies diff --git a/sope-appserver/WEPrototype/fhs.make b/sope-appserver/WEPrototype/fhs.make index fc46b8e6..70e664a0 100644 --- a/sope-appserver/WEPrototype/fhs.make +++ b/sope-appserver/WEPrototype/fhs.make @@ -5,11 +5,16 @@ 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/ -FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ FHS_MAN_DIR=$(FHS_INSTALL_ROOT)/man +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif +FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/ + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" -- 2.39.5