From a80b4de1ef5ecb0756d9534c7498a34f258cf764 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 3 Jul 2006 19:47:47 +0000 Subject: [PATCH] make makefiles detect 64bit FHS locations git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1283 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-xml/DOM/fhs.make | 7 ++++++- sope-xml/STXSaxDriver/fhs.make | 5 +++++ sope-xml/SaxObjC/fhs.make | 7 ++++++- sope-xml/libxmlSAXDriver/GNUmakefile.preamble | 4 ++++ sope-xml/libxmlSAXDriver/fhs.make | 5 +++++ sope-xml/pyxSAXDriver/fhs.make | 5 +++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/sope-xml/DOM/fhs.make b/sope-xml/DOM/fhs.make index c3eebaea..6e8d6c14 100644 --- a/sope-xml/DOM/fhs.make +++ b/sope-xml/DOM/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)$(libDOM_HEADER_FILES_INSTALL_DIR) diff --git a/sope-xml/STXSaxDriver/fhs.make b/sope-xml/STXSaxDriver/fhs.make index 29e05231..bb1b0ade 100644 --- a/sope-xml/STXSaxDriver/fhs.make +++ b/sope-xml/STXSaxDriver/fhs.make @@ -4,7 +4,12 @@ ifneq ($(FHS_INSTALL_ROOT),) +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/saxdrivers/ fhs-sax-dirs :: diff --git a/sope-xml/SaxObjC/fhs.make b/sope-xml/SaxObjC/fhs.make index 6668d62a..216c1fbc 100644 --- a/sope-xml/SaxObjC/fhs.make +++ b/sope-xml/SaxObjC/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)$(libSaxObjC_HEADER_FILES_INSTALL_DIR) diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile.preamble b/sope-xml/libxmlSAXDriver/GNUmakefile.preamble index bfbd132b..1b6a0509 100644 --- a/sope-xml/libxmlSAXDriver/GNUmakefile.preamble +++ b/sope-xml/libxmlSAXDriver/GNUmakefile.preamble @@ -34,7 +34,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 # platform specific options diff --git a/sope-xml/libxmlSAXDriver/fhs.make b/sope-xml/libxmlSAXDriver/fhs.make index 56604151..911b36c0 100644 --- a/sope-xml/libxmlSAXDriver/fhs.make +++ b/sope-xml/libxmlSAXDriver/fhs.make @@ -4,7 +4,12 @@ ifneq ($(FHS_INSTALL_ROOT),) +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxdrivers/ fhs-sax-dirs :: diff --git a/sope-xml/pyxSAXDriver/fhs.make b/sope-xml/pyxSAXDriver/fhs.make index 29e05231..bb1b0ade 100644 --- a/sope-xml/pyxSAXDriver/fhs.make +++ b/sope-xml/pyxSAXDriver/fhs.make @@ -4,7 +4,12 @@ ifneq ($(FHS_INSTALL_ROOT),) +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/saxdrivers/ fhs-sax-dirs :: -- 2.39.5