more 64bit FHS makefile fixes

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

diff --git a/sope-xml/samples/GNUmakefile.preamble b/sope-xml/samples/GNUmakefile.preamble
index e6de2b468dbe324c827b5b09b8f816b255a3bace..d181805c6f02b122f2afb2fb9a51b2a156aca4aa 100644 (file)
--- a/sope-xml/samples/GNUmakefile.preamble
+++ b/sope-xml/samples/GNUmakefile.preamble
@@ -42,4 +42,8 @@ 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-xml/samples/fhs.make b/sope-xml/samples/fhs.make
index 27c85d132f247031b8a70de234b6343cabd161f8..9c684b4d355d187f39389bd7bfe7d599dfbaaa60 100644 (file)
--- a/sope-xml/samples/fhs.make
+++ b/sope-xml/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)