From: helge Date: Mon, 3 Jul 2006 22:24:50 +0000 (+0000) Subject: fixed 64bit makefiles X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae430bd44299a28b0fb69aa5d8b2e9856109391b;p=sope fixed 64bit makefiles git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1291 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble index 7181ae94..3d6ec700 100644 --- a/sope-mime/GNUmakefile.preamble +++ b/sope-mime/GNUmakefile.preamble @@ -42,7 +42,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 diff --git a/sope-mime/fhs.make b/sope-mime/fhs.make index 4a298aac..fdc24aca 100644 --- a/sope-mime/fhs.make +++ b/sope-mime/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 + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"