make makefiles detect 64bit FHS locations

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1283 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-xml/DOM/fhs.make b/sope-xml/DOM/fhs.make
index c3eebaeabb357da029e5f20eec2395d9b226725d..6e8d6c14c08c2265cf4bf3522f4439b395055e55 100644 (file)
--- 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 29e052314e835360f5dfaa9696043dfb97f90101..bb1b0ade597d6b66a7dbe744725e650b42ed5b1f 100644 (file)
--- 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 6668d62a8145cbb4b4da402326d0c828eccad31d..216c1fbcebad5c632c8f942b5e450cd54ed8561c 100644 (file)
--- 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 bfbd132b1d2ed5af65d8992b40f91a62b7c08c1d..1b6a0509c6cb0bfce3fe19687d68e2b9dc7cf390 100644 (file)
--- 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 5660415198d149caa3def5ace6273cacbfb42513..911b36c0710517f801abe64683362e9efaad5eb8 100644 (file)
--- 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 29e052314e835360f5dfaa9696043dfb97f90101..bb1b0ade597d6b66a7dbe744725e650b42ed5b1f 100644 (file)
--- 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 ::