fixed makefiles for 64bit

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

diff --git a/sope-appserver/WOXML/GNUmakefile.preamble b/sope-appserver/WOXML/GNUmakefile.preamble
index 30f4ddfbb32fd9971a4262c9deb462d5bac94b3a..a22b657ec4bd37d09771754cb9960989091cc78c 100644 (file)
--- 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 6670de76d3648f508ca7d81540e38435698d5733..34163b02b36a6be40502971b244d4cf0bb396c76 100644 (file)
--- 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 27c85d132f247031b8a70de234b6343cabd161f8..9c684b4d355d187f39389bd7bfe7d599dfbaaa60 100644 (file)
--- 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)